Repository: mesos Updated Branches: refs/heads/master f66289831 -> 444c60bea
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/444c60be Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/444c60be Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/444c60be Branch: refs/heads/master Commit: 444c60beac5625e22dac99a059d782e662379091 Parents: f662898 Author: Benjamin Mahler <[email protected]> Authored: Tue Jul 29 16:00:57 2014 -0700 Committer: Benjamin Mahler <[email protected]> Committed: Tue Jul 29 16:02:05 2014 -0700 ---------------------------------------------------------------------- src/tests/slave_recovery_tests.cpp | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/444c60be/src/tests/slave_recovery_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp index d024bd9..68ea3a2 100644 --- a/src/tests/slave_recovery_tests.cpp +++ b/src/tests/slave_recovery_tests.cpp @@ -2439,6 +2439,9 @@ TYPED_TEST(SlaveRecoveryTest, SchedulerFailover) Future<Nothing> _recover = FUTURE_DISPATCH(_, &Slave::_recover); + Future<ReregisterExecutorMessage> reregisterExecutorMessage = + FUTURE_PROTOBUF(ReregisterExecutorMessage(), _, _); + Future<SlaveReregisteredMessage> slaveReregisteredMessage = FUTURE_PROTOBUF(SlaveReregisteredMessage(), _, _); @@ -2453,6 +2456,9 @@ TYPED_TEST(SlaveRecoveryTest, SchedulerFailover) 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);
