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

REST API tests refactoring (Part 4) #4255

Merged
merged 1 commit into from May 7, 2024

Conversation

willyborankin
Copy link
Collaborator

Description

Moved test:

  • SecurityConfigApiActionTest into ConfigRestApiIntegrationTest

Test with the Legacy prefix removed since new tests use randomization for paths

Check List

  • New functionality includes testing
  • New functionality has been documented
  • 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.

@cwperks
Copy link
Member

cwperks commented May 6, 2024

@willyborankin Can you rebase this PR?

The changes look good to me.

Moved test:
 - SecurityConfigApiActionTest into ConfigRestApiIntegrationTest

Test with the Legacy prefix removed since new tests use randomization for paths

Signed-off-by: Andrey Pleskach <ples@aiven.io>
@willyborankin
Copy link
Collaborator Author

@willyborankin Can you rebase this PR?

The changes look good to me.

done

Copy link

codecov bot commented May 7, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 66.02%. Comparing base (3b94522) to head (4a82b30).

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4255      +/-   ##
==========================================
- Coverage   66.07%   66.02%   -0.05%     
==========================================
  Files         302      302              
  Lines       21758    21758              
  Branches     3522     3522              
==========================================
- Hits        14376    14366      -10     
- Misses       5614     5623       +9     
- Partials     1768     1769       +1     

see 8 files with indirect coverage changes

@cwperks cwperks merged commit faac5e3 into opensearch-project:main May 7, 2024
81 of 82 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-4255-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 faac5e3bfdd55aad69a4bb2cfc8c31c6988d46ea
# Push it to GitHub
git push --set-upstream origin backport/backport-4255-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-4255-to-2.x.

@DarshitChanpura
Copy link
Member

@willyborankin would you mind creating a manual backport to 2.x for this?

willyborankin added a commit to willyborankin/security that referenced this pull request May 7, 2024
Signed-off-by: Andrey Pleskach <ples@aiven.io>
(cherry picked from commit faac5e3)
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 backport-failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants