Move REST API tests into integration tests (Part 1) #4153
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
willyborankin
force-pushed
the
refactor-tests
branch
2 times, most recently
from
bbdfd76 to
d194185
Compare
peternied
reviewed
Mar 26, 2024
src/integrationTest/java/org/opensearch/security/api/AbstractApiIntegrationTest.java
Outdated
Show resolved
Hide resolved
willyborankin
added a commit
to willyborankin/security
that referenced
this pull request
Mar 26, 2024
- Added hidden/reserved fields for TestSecurityConfig.User, TestSecurityConfig.Role - Moved RolesMapping class into TestSecurityConfig - Added ActionGroup class in TestSecurityConfig - LocalOpenSearchCluster now always delete config folders when any test is over - Added bodyAsJsonNode in the HttpResponse class Signed-off-by: Andrey Pleskach <[email protected]>
peternied
reviewed
Mar 26, 2024
3 tasks
willyborankin
force-pushed
the
refactor-tests
branch
2 times, most recently
from
e9ca7ad to
78be229
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #4153 +/- ##
==========================================
- Coverage 66.15% 66.04% -0.12%
==========================================
Files 301 301
Lines 21708 21709 +1
Branches 3506 3506
==========================================
- Hits 14362 14337 -25
- Misses 5584 5610 +26
Partials 1762 1762
|
willyborankin
force-pushed
the
refactor-tests
branch
2 times, most recently
from
098e9f7 to
e79c158
Compare
willyborankin
force-pushed
the
refactor-tests
branch
from
e79c158 to
9d3fab7
Compare
willyborankin
changed the title
willyborankin
requested review from
cliu123,
DarshitChanpura,
RyanL1997,
stephen-crawford and
reta
as code owners
willyborankin
force-pushed
the
refactor-tests
branch
2 times, most recently
from
9b87bae to
2fdaf28
Compare
stephen-crawford
previously approved these changes
Apr 8, 2024
src/integrationTest/java/org/opensearch/security/ConfigurationFiles.java
Outdated
Show resolved
Hide resolved
src/integrationTest/java/org/opensearch/security/ConfigurationFiles.java
Outdated
Show resolved
Hide resolved
src/integrationTest/java/org/opensearch/security/api/AbstractApiIntegrationTest.java
Show resolved
Hide resolved
src/integrationTest/java/org/opensearch/test/framework/TestSecurityConfig.java
Show resolved
Hide resolved
willyborankin
force-pushed
the
refactor-tests
branch
from
2fdaf28 to
b38fe15
Compare
|
Hi, @scrawfor99 than you for the review. I addressed your comments |
willyborankin
force-pushed
the
refactor-tests
branch
4 times, most recently
from
10ee660 to
cec6278
Compare
willyborankin
force-pushed
the
refactor-tests
branch
from
cec6278 to
e0191cc
Compare
peternied
previously approved these changes
Apr 12, 2024
src/integrationTest/java/org/opensearch/security/api/AccountRestApiIntegrationTest.java
Outdated
Show resolved
Hide resolved
cwperks
previously approved these changes
Apr 12, 2024
Added test: - DefaultApiAvailabilityIntegrationTest Moved tests: - FlushCacheApiTest part of DefaultApiAvailabilityIntegrationTest - AccountApiTest as AccountRestApiIntegrationTest Tests with the Legacy prefix removed since new tests use randomization for paths Signed-off-by: Andrey Pleskach <[email protected]>
willyborankin
force-pushed
the
refactor-tests
branch
from
e0191cc to
ec26a2f
Compare
peternied
approved these changes
Apr 12, 2024
stephen-crawford
approved these changes
Apr 15, 2024
cwperks
approved these changes
Apr 15, 2024
stephen-crawford
merged commit a6b04ae
into
opensearch-project:main
80 of 83 checks passed
|
The backport to 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-4153-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a6b04ae751c5233aeaf50ff63a918fccb58caa31
# Push it to GitHub
git push --set-upstream origin backport/backport-4153-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-2.xThen, create a pull request where the |
willyborankin
added a commit
to willyborankin/security
that referenced
this pull request
Apr 29, 2024
…pensearch-project#4153) Signed-off-by: Andrey Pleskach <[email protected]>
dlin2028
pushed a commit
to dlin2028/security
that referenced
this pull request
May 1, 2024
…ct#4153) Signed-off-by: Andrey Pleskach <[email protected]>
cwperks
pushed a commit
that referenced
this pull request
May 6, 2024
…4153) (#4302) Signed-off-by: Andrey Pleskach <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
REST API tests refactoring. First part of moving REST API tests into
integrationTests.Added test:
DefaultApiAvailabilityIntegrationTestMoved tests:
FlushCacheApiTestpart ofDefaultApiAvailabilityIntegrationTestAccountApiTestasAccountRestApiIntegrationTestTests with the
Legacyprefix removed since new tests use randomization for pathsTesting
[Please provide details of testing done: unit testing, integration testing and manual testing]
Check List
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.