Another fix

nielsbauman · nielsbauman · commit 3bac353a1622 · 2025-04-17T11:07:46.000+02:00
diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java
@@ -1629,7 +1629,7 @@ protected Settings cleanupClientSettings() {
     }
 
     private Settings addProjectIdToSettings(Settings settings) {
-        if (multiProjectEnabled == false) {
+        if (multiProjectEnabled == false || shouldConfigureProjects() == false) {
             return settings;
         }
         return Settings.builder()

Original file line number	Diff line number	Diff line change
`@@ -1629,7 +1629,7 @@ protected Settings cleanupClientSettings() {`
`1629`	`1629`	`}`
`1630`	`1630`
`1631`	`1631`	`private Settings addProjectIdToSettings(Settings settings) {`
`1632`		`- if (multiProjectEnabled == false) {`
	`1632`	`+ if (multiProjectEnabled == false \|\| shouldConfigureProjects() == false) {`
`1633`	`1633`	`return settings;`
`1634`	`1634`	`}`
`1635`	`1635`	`return Settings.builder()`