Skip to content

Commit a894c49

Browse files
authored
Make archive setting test version stable (elastic#138874) (elastic#138920)
Change the assertion on the test to remove the version query parameter that might cause issues in the future. (cherry picked from commit 38d1de3) # Conflicts: # server/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java
1 parent 025bafc commit a894c49

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

server/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import static org.hamcrest.CoreMatchers.containsString;
4444
import static org.hamcrest.CoreMatchers.equalTo;
4545
import static org.hamcrest.CoreMatchers.startsWith;
46+
import static org.hamcrest.Matchers.both;
4647
import static org.hamcrest.Matchers.hasToString;
4748
import static org.mockito.Mockito.clearInvocations;
4849
import static org.mockito.Mockito.never;
@@ -343,13 +344,10 @@ public void testValidateArchivedSetting() {
343344
);
344345
assertThat(
345346
e.getMessage(),
346-
equalTo(
347-
"unknown setting [archived.index.store.type] was archived after upgrading, and must be removed."
348-
+ " See [https://www.elastic.co/docs/deploy-manage/upgrade/deployment-or-cluster/archived-settings?version=9.1] "
349-
+ "for details."
347+
both(containsString("unknown setting [archived.index.store.type] was archived after upgrading, and must be removed.")).and(
348+
containsString("https://www.elastic.co/docs/deploy-manage/upgrade/deployment-or-cluster/archived-settings")
350349
)
351350
);
352-
353351
}
354352

355353
public void testTupleAffixUpdateConsumer() {

0 commit comments

Comments
 (0)