Skip to content

Commit 3054917

Browse files
committed
Fix MP tests
1 parent 2b2781f commit 3054917

File tree

4 files changed

+8
-1
lines changed

4 files changed

+8
-1
lines changed

test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2794,7 +2794,7 @@ private Collection<String> getProjectIds(RestClient client) throws IOException {
27942794
protected void cleanUpProjects() throws IOException {
27952795
final var projectIds = getProjectIds(adminClient());
27962796
for (String projectId : projectIds) {
2797-
if (projectId.equals(ProjectId.DEFAULT.id())) {
2797+
if (projectId.equals(ProjectId.DEFAULT.id()) || projectId.equals(activeProject) || extraProjects.contains(projectId)) {
27982798
continue;
27992799
}
28002800
deleteProject(projectId);

x-pack/plugin/security/qa/multi-project/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,7 @@ tasks.named('javaRestTest') {
88
usesDefaultDistribution("to be triaged")
99
it.onlyIf("snapshot build") { buildParams.snapshotBuild }
1010
}
11+
12+
tasks.withType(Test).configureEach {
13+
it.systemProperty "test.multi_project.enabled", true
14+
}

x-pack/qa/multi-project/core-rest-tests-with-multiple-projects/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,6 @@ tasks.named("yamlRestTest").configure {
8282
blacklist += [];
8383
}
8484
systemProperty 'tests.rest.blacklist', blacklist.join(',')
85+
86+
systemProperty "test.multi_project.enabled", true
8587
}

x-pack/qa/multi-project/xpack-rest-tests-with-multiple-projects/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,4 +164,5 @@ tasks.named("yamlRestTest").configure {
164164
blacklist += [];
165165
}
166166
systemProperty 'tests.rest.blacklist', blacklist.join(',')
167+
systemProperty "test.multi_project.enabled", true
167168
}

0 commit comments

Comments
 (0)