Skip to content

Commit 36436ff

Browse files
committed
Fix testRejectionMessageAndShuttingDownFlag (#52280)
This test broke after merging #52280.
1 parent 27f45ae commit 36436ff

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

server/src/main/java/org/elasticsearch/common/util/concurrent/TimedRunnable.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,14 @@ public Runnable unwrap() {
105105
return original;
106106
}
107107

108+
@Override
109+
public String toString() {
110+
return "TimedRunnable{" +
111+
"original=" + original +
112+
", creationTimeNanos=" + creationTimeNanos +
113+
", startTimeNanos=" + startTimeNanos +
114+
", finishTimeNanos=" + finishTimeNanos +
115+
", failedOrRejected=" + failedOrRejected +
116+
'}';
117+
}
108118
}

server/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
import static org.hamcrest.Matchers.anyOf;
3535
import static org.hamcrest.Matchers.containsString;
36+
import static org.hamcrest.Matchers.either;
3637
import static org.hamcrest.Matchers.equalTo;
3738
import static org.hamcrest.Matchers.hasToString;
3839
import static org.hamcrest.Matchers.lessThan;
@@ -279,8 +280,9 @@ public String toString() {
279280
} catch (EsRejectedExecutionException e) {
280281
assertFalse("Thread pool registering as terminated when it isn't", e.isExecutorShutdown());
281282
String message = e.getMessage();
282-
assertThat(message, containsString("of dummy runnable"));
283-
assertThat(message, containsString("on EsThreadPoolExecutor[name = " + getName()));
283+
assertThat(message, containsString("dummy runnable"));
284+
assertThat(message, either(containsString("on EsThreadPoolExecutor[name = " + getName()))
285+
.or(containsString("on EWMATrackingEsThreadPoolExecutor[name = " + getName())));
284286
assertThat(message, containsString("queue capacity = " + queue));
285287
assertThat(message, containsString("[Running"));
286288
/*
@@ -319,8 +321,9 @@ public String toString() {
319321
} catch (EsRejectedExecutionException e) {
320322
assertTrue("Thread pool not registering as terminated when it is", e.isExecutorShutdown());
321323
String message = e.getMessage();
322-
assertThat(message, containsString("of dummy runnable"));
323-
assertThat(message, containsString("on EsThreadPoolExecutor[name = " + getName()));
324+
assertThat(message, containsString("dummy runnable"));
325+
assertThat(message, either(containsString("on EsThreadPoolExecutor[name = " + getName()))
326+
.or(containsString("on EWMATrackingEsThreadPoolExecutor[name = " + getName())));
324327
assertThat(message, containsString("queue capacity = " + queue));
325328
assertThat(message, containsString("[Terminated"));
326329
assertThat(message, containsString("active threads = 0"));

0 commit comments

Comments
 (0)