Merge branch 'master' into ccr

* master: Adapt transport tests for the extra byte introduced in #31020
elastic · Jun 2, 2018 · 5fd759b · 5fd759b
2 parents 9564b60 + 65d3f0e
commit 5fd759b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.../framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java b/.../framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java
@@ -2329,15 +2329,15 @@ public String executor() {
                 assertEquals(1, transportStats.getRxCount());
                 assertEquals(2, transportStats.getTxCount());
                 assertEquals(25, transportStats.getRxSize().getBytes());
-                assertEquals(91, transportStats.getTxSize().getBytes());
+                assertEquals(92, transportStats.getTxSize().getBytes());
             });
             sendResponseLatch.countDown();
             responseLatch.await();
             stats = serviceC.transport.getStats(); // response has been received
             assertEquals(2, stats.getRxCount());
             assertEquals(2, stats.getTxCount());
             assertEquals(46, stats.getRxSize().getBytes());
-            assertEquals(91, stats.getTxSize().getBytes());
+            assertEquals(92, stats.getTxSize().getBytes());
         } finally {
             serviceC.close();
         }
@@ -2444,7 +2444,7 @@ public String executor() {
                 assertEquals(1, transportStats.getRxCount());
                 assertEquals(2, transportStats.getTxCount());
                 assertEquals(25, transportStats.getRxSize().getBytes());
-                assertEquals(91, transportStats.getTxSize().getBytes());
+                assertEquals(92, transportStats.getTxSize().getBytes());
             });
             sendResponseLatch.countDown();
             responseLatch.await();
@@ -2459,7 +2459,7 @@ public String executor() {
             // 49 bytes are the non-exception message bytes that have been received. It should include the initial
             // handshake message and the header, version, etc bytes in the exception message.
             assertEquals(failedMessage, 49 + streamOutput.bytes().length(), stats.getRxSize().getBytes());
-            assertEquals(91, stats.getTxSize().getBytes());
+            assertEquals(92, stats.getTxSize().getBytes());
         } finally {
             serviceC.close();
         }