Repository: mesos Updated Branches: refs/heads/master a3cd43ef9 -> 3047bbe41
Fixed a flaky slave recovery test. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3047bbe4 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3047bbe4 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3047bbe4 Branch: refs/heads/master Commit: 3047bbe41c92978ed14547070142c7b6a3a6ea9c Parents: a3cd43e Author: Benjamin Mahler <[email protected]> Authored: Thu Jul 31 15:19:44 2014 -0700 Committer: Benjamin Mahler <[email protected]> Committed: Thu Jul 31 15:20:01 2014 -0700 ---------------------------------------------------------------------- src/tests/slave_recovery_tests.cpp | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/3047bbe4/src/tests/slave_recovery_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp index 06ab899..0b17a8a 100644 --- a/src/tests/slave_recovery_tests.cpp +++ b/src/tests/slave_recovery_tests.cpp @@ -2737,6 +2737,9 @@ TYPED_TEST(SlaveRecoveryTest, MasterFailover) // Step 3. Restart the slave and kill the task. Future<Nothing> _recover = FUTURE_DISPATCH(_, &Slave::_recover); + Future<ReregisterExecutorMessage> reregisterExecutorMessage = + FUTURE_PROTOBUF(ReregisterExecutorMessage(), _, _); + Future<SlaveReregisteredMessage> slaveReregisteredMessage = FUTURE_PROTOBUF(SlaveReregisteredMessage(), _, _); @@ -2751,6 +2754,9 @@ TYPED_TEST(SlaveRecoveryTest, MasterFailover) AWAIT_READY(_recover); + // Wait for the executor to re-register. + AWAIT_READY(reregisterExecutorMessage); + Clock::settle(); // Wait for slave to schedule reregister timeout. Clock::advance(EXECUTOR_REREGISTER_TIMEOUT);
