fixing another indeterminism around index update

Author: lucianoviana

artio-binary-entrypoint-system-tests/src/test/java/uk/co/real_logic/artio/system_tests/BinaryEntryPointSystemTest.java

@@ -451,9 +451,6 @@ public void shouldAcceptReEstablishmentOfSession() throws IOException
 
         restartArtio();
 
-        // if not this, then sometimes the 'alreadyRecvMsgCount' does not match 'nextSeqNo' below when calling
-        // readEstablishAck
-        awaitIndexerCaughtUp(testSystem, mediaDriver.mediaDriver().aeronDirectoryName(), engine, library);
         reEstablishConnection(3, 3);
     }
 
@@ -2193,6 +2190,10 @@ private void withReEstablishedConnection(
     {
         try (BinaryEntryPointClient client = newClient())
         {
+            // if not this, then sometimes the 'alreadyRecvMsgCount' does not match 'nextSeqNo' below when calling
+            // readEstablishAck
+            awaitIndexerCaughtUp(testSystem, mediaDriver.mediaDriver().aeronDirectoryName(), engine, library);
+
             final int nextSeqNo = alreadyRecvMsgCount + 1;
             client.writeEstablish(nextSeqNo);
 

artio-system-tests/src/test/java/uk/co/real_logic/artio/system_tests/MessageBasedAcceptorSystemTest.java

@@ -601,6 +601,10 @@ public void shouldSupportLogonBasedSequenceNumberResetWithMessagesSentBeforeLogo
             testSystem.awaitMessageOf(otfAcceptor, EXECUTION_REPORT_MESSAGE_AS_STR,
                 msg -> msg.messageSequenceNumber() == seqNum2 && msg.sequenceIndex() == 1);
 
+            // to ensure the indexes are processed before resend request is received - which would mean a gapfill
+            // responded rather than a replay msg
+            awaitIndexerCaughtUp(testSystem, mediaDriver.mediaDriver().aeronDirectoryName(), engine, library);
+
             connection.sendResendRequest(2, 2);
             testSystem.awaitBlocking(
                 () -> assertEquals(Side.SELL, connection.readResentExecutionReport(2).sideAsEnum()));