Skip to content

Commit 6a50f48

Browse files
Adjust warning message for 8.x version in test (#129980)
Deprecation warning messages are slightly different on the 8.* branch. Somehow the warning message in this test was not covered by #129628 . Fixes #129761
1 parent 7225b35 commit 6a50f48

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,3 @@ tests:
456456
- class: org.elasticsearch.index.engine.ThreadPoolMergeSchedulerTests
457457
method: testSchedulerCloseWaitsForRunningMerge
458458
issue: https://github.com/elastic/elasticsearch/issues/125236
459-
- class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests
460-
method: testEnqueuedMergeTasksAreUnblockedWhenEstimatedMergeSizeChanges
461-
issue: https://github.com/elastic/elasticsearch/issues/129761

server/src/test/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorServiceDiskSpaceTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -986,8 +986,7 @@ public void testEnqueuedMergeTasksAreUnblockedWhenEstimatedMergeSizeChanges() th
986986
}
987987
if (setThreadPoolMergeSchedulerSetting) {
988988
assertWarnings(
989-
"[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch "
990-
+ "and will be removed in a future release. See the breaking changes documentation for the next major version."
989+
"[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release."
991990
);
992991
}
993992
}

0 commit comments

Comments
 (0)