|
9 | 9 |
|
10 | 10 | package org.elasticsearch.transport; |
11 | 11 |
|
| 12 | +import org.apache.logging.log4j.Level; |
12 | 13 | import org.elasticsearch.Build; |
13 | | -import org.elasticsearch.ExceptionsHelper; |
14 | 14 | import org.elasticsearch.TransportVersion; |
15 | 15 | import org.elasticsearch.TransportVersions; |
16 | 16 | import org.elasticsearch.Version; |
|
27 | 27 | import org.elasticsearch.index.IndexVersions; |
28 | 28 | import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; |
29 | 29 | import org.elasticsearch.test.ESTestCase; |
| 30 | +import org.elasticsearch.test.MockLog; |
30 | 31 | import org.elasticsearch.test.TransportVersionUtils; |
31 | 32 | import org.elasticsearch.test.VersionUtils; |
32 | 33 | import org.elasticsearch.test.transport.MockTransportService; |
@@ -350,23 +351,26 @@ public void testRejectsMismatchedBuildHash() { |
350 | 351 | .version(Version.CURRENT.minimumCompatibilityVersion(), IndexVersions.MINIMUM_COMPATIBLE, IndexVersion.current()) |
351 | 352 | .build(); |
352 | 353 | try ( |
| 354 | + MockLog mockLog = MockLog.capture(TransportService.class); |
353 | 355 | Transport.Connection connection = AbstractSimpleTransportTestCase.openConnection( |
354 | 356 | transportServiceA, |
355 | 357 | discoveryNode, |
356 | 358 | TestProfiles.LIGHT_PROFILE |
357 | 359 | ) |
358 | 360 | ) { |
359 | | - assertThat( |
360 | | - ExceptionsHelper.unwrap( |
361 | | - safeAwaitFailure( |
362 | | - TransportSerializationException.class, |
363 | | - DiscoveryNode.class, |
364 | | - listener -> transportServiceA.handshake(connection, timeout, listener) |
365 | | - ), |
366 | | - IllegalArgumentException.class |
367 | | - ).getMessage(), |
368 | | - containsString("which has an incompatible wire format") |
| 361 | + mockLog.addExpectation( |
| 362 | + new MockLog.SeenEventExpectation( |
| 363 | + "message", |
| 364 | + TransportService.class.getCanonicalName(), |
| 365 | + Level.WARN, |
| 366 | + "which has an incompatible wire format" |
| 367 | + ) |
369 | 368 | ); |
| 369 | + |
| 370 | + DiscoveryNode connectedNode = safeAwait(listener -> transportServiceA.handshake(connection, timeout, listener)); |
| 371 | + assertNotNull(connectedNode); |
| 372 | + |
| 373 | + mockLog.awaitAllExpectationsMatched(); |
370 | 374 | } |
371 | 375 | assertFalse(transportServiceA.nodeConnected(discoveryNode)); |
372 | 376 | } |
|
0 commit comments