Skip to content

Commit

Permalink
Fix expected bytes in tests due to new major version
Browse files Browse the repository at this point in the history
In 6.x we had to serialize the 2 byte marker for the transport address type
for BWC. Now in 6.x this doesn't exist and we write 2 bytes less when we serialize
a transport address to a min compat node.

Closes elastic#25893
  • Loading branch information
s1monw committed Jul 28, 2017
1 parent a4df8db commit d6e2c06
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2422,7 +2422,7 @@ public String executor() {
int addressLen = serviceB.boundAddress().publishAddress().address().getAddress().getAddress().length;
// if we are bound to a IPv6 address the response address is serialized with the exception so it will be different depending
// on the stack. The emphemeral port will always be in the same range
assertEquals(185 + addressLen, stats.getRxSize().getBytes());
assertEquals(183 + addressLen, stats.getRxSize().getBytes());
assertEquals(91, stats.getTxSize().getBytes());
} finally {
serviceC.close();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,4 @@ protected Version executeHandshake(DiscoveryNode node, MockChannel mockChannel,
mockTransportService.start();
return mockTransportService;
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/25893")
@Override
public void testTransportStatsWithException() throws Exception {
super.testTransportStatsWithException();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,4 @@ public void testBindUnavailableAddress() {
});
assertEquals("Failed to bind to ["+ port + "]", bindTransportException.getMessage());
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/25893")
@Override
public void testTransportStatsWithException() throws Exception {
super.testTransportStatsWithException();
}
}

0 comments on commit d6e2c06

Please sign in to comment.