Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed test failures in FlsAndFieldMaskingTests #4548

Merged
merged 1 commit into from
Jul 11, 2024

Conversation

nibix
Copy link
Collaborator

@nibix nibix commented Jul 11, 2024

Description

Fixes failing tests in FlsAndFieldMaskingTests.

The tests flsWithIncludesRulesIncludesFieldMappersFromPlugins and testFlsOnAClosedAndReopenedIndex both used the REST API to create an identical test user. However, the test which executes second would get a 200 Ok REST status instead a 201 Created REST status, as the PUT would operate on a resource that already exists.

This caused the test to fail.

This moves the user to the global user definition of the test.

  • Category: Test fix
  • Why these changes are required? - The test failed before
  • What is the old behavior before changes and new behavior after changes? - None

Check List

  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Copy link

codecov bot commented Jul 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 65.02%. Comparing base (9d32a8c) to head (5128019).
Report is 1 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4548      +/-   ##
==========================================
+ Coverage   64.99%   65.02%   +0.03%     
==========================================
  Files         314      314              
  Lines       22111    22111              
  Branches     3566     3566              
==========================================
+ Hits        14370    14378       +8     
+ Misses       5955     5946       -9     
- Partials     1786     1787       +1     

see 2 files with indirect coverage changes

Copy link
Member

@cwperks cwperks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. Thank you @nibix !

@willyborankin willyborankin added the backport 2.x backport to 2.x branch label Jul 11, 2024
@willyborankin willyborankin merged commit 08d3a6c into opensearch-project:main Jul 11, 2024
43 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/security/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security/backport-2.x
# Create a new branch
git switch --create backport/backport-4548-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 08d3a6cedc737b82b31aa03e80748dcef698a33d
# Push it to GitHub
git push --set-upstream origin backport/backport-4548-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-4548-to-2.x.

@cwperks
Copy link
Member

cwperks commented Jul 11, 2024

@nibix Can you raise a backport PR for this change?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants