[mesos] branch master updated: Fixed flakiness in an operation reconciliation test.

[gr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

grag pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git


The following commit(s) were added to refs/heads/master by this push:
     new 9231d78  Fixed flakiness in an operation reconciliation test.
9231d78 is described below

commit 9231d7841b4ba5ff246027c1fbe20fb6f6f2abb6
Author: Greg Mann <gr...@mesosphere.io>
AuthorDate: Tue Sep 4 08:24:05 2018 -0700

    Fixed flakiness in an operation reconciliation test.
    
    Review: https://reviews.apache.org/r/68592/
---
 src/tests/operation_reconciliation_tests.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/tests/operation_reconciliation_tests.cpp b/src/tests/operation_reconciliation_tests.cpp
index f66c2c3..37d38b3 100644
--- a/src/tests/operation_reconciliation_tests.cpp
+++ b/src/tests/operation_reconciliation_tests.cpp
@@ -813,6 +813,8 @@ TEST_P(OperationReconciliationTest, AgentPendingOperationAfterMasterFailover)
   Future<SlaveReregisteredMessage> slaveReregistered = FUTURE_PROTOBUF(
       SlaveReregisteredMessage(), master.get()->pid, slave.get()->pid);
 
+  updateSlaveMessage = FUTURE_PROTOBUF(UpdateSlaveMessage(), _, _);
+
   EXPECT_CALL(*scheduler, connected(_))
     .WillOnce(scheduler::SendSubscribe(frameworkInfo, frameworkId));
 
@@ -832,6 +834,7 @@ TEST_P(OperationReconciliationTest, AgentPendingOperationAfterMasterFailover)
 
   // Wait for the framework and agent to re-register.
   AWAIT_READY(slaveReregistered);
+  AWAIT_READY(updateSlaveMessage);
   AWAIT_READY(frameworkResubscribed);
 
   Clock::pause();