Skip to content

Commit

Permalink
Fix security based integration tests (#59) (#63)
Browse files Browse the repository at this point in the history
(cherry picked from commit c7fb34d)

Signed-off-by: Chenyang Ji <cyji@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
1 parent 479f7b8 commit e5fe0f9
Showing 1 changed file with 3 additions and 14 deletions.
17 changes: 3 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -260,18 +260,9 @@ integTest {
if (System.getProperty("test.debug") != null) {
jvmArgs '-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005'
}
// NOTE: this IT config discovers only junit5 (jupiter) tests.
// https://github.com/opensearch-project/sql/issues/1974
filter {
includeTestsMatching 'org.opensearch.plugin.insights.rules.resthandler.top_queries.TopQueriesRestIT'
}

if (System.getProperty("security.enabled") == "true") {
getClusters().forEach { cluster ->
configureSecurityPlugin(cluster)
}
systemProperty "user", "admin"
systemProperty "password", "admin"
if (System.getProperty("security.enabled") == "true" || System.getProperty("https") == "true") {
// Exclude this IT, because they executed in another task (:integTestWithSecurity)
exclude 'org/opensearch/plugin/insights/rules/resthandler/top_queries/TopQueriesRestIT.class'
}
}

Expand Down Expand Up @@ -342,8 +333,6 @@ task integTestWithSecurity(type: RestIntegTestTask) {
jvmArgs '-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005'
}

// NOTE: this IT config discovers only junit5 (jupiter) tests.
// https://github.com/opensearch-project/sql/issues/1974
filter {
includeTestsMatching 'org.opensearch.plugin.insights.rules.resthandler.top_queries.TopQueriesRestIT'
}
Expand Down

0 comments on commit e5fe0f9

Please sign in to comment.