|
33 | 33 |
|
34 | 34 | import static org.hamcrest.Matchers.anyOf; |
35 | 35 | import static org.hamcrest.Matchers.containsString; |
| 36 | +import static org.hamcrest.Matchers.either; |
36 | 37 | import static org.hamcrest.Matchers.equalTo; |
37 | 38 | import static org.hamcrest.Matchers.hasToString; |
38 | 39 | import static org.hamcrest.Matchers.lessThan; |
@@ -279,8 +280,9 @@ public String toString() { |
279 | 280 | } catch (EsRejectedExecutionException e) { |
280 | 281 | assertFalse("Thread pool registering as terminated when it isn't", e.isExecutorShutdown()); |
281 | 282 | 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()))); |
284 | 286 | assertThat(message, containsString("queue capacity = " + queue)); |
285 | 287 | assertThat(message, containsString("[Running")); |
286 | 288 | /* |
@@ -319,8 +321,9 @@ public String toString() { |
319 | 321 | } catch (EsRejectedExecutionException e) { |
320 | 322 | assertTrue("Thread pool not registering as terminated when it is", e.isExecutorShutdown()); |
321 | 323 | 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()))); |
324 | 327 | assertThat(message, containsString("queue capacity = " + queue)); |
325 | 328 | assertThat(message, containsString("[Terminated")); |
326 | 329 | assertThat(message, containsString("active threads = 0")); |
|
0 commit comments