Repository: mesos Updated Branches: refs/heads/master d6c1ef684 -> 9b2bbba89
Fixed the flaky FaultToleranceTest.ReconcilePendingTasks. Review: https://reviews.apache.org/r/25604 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9b2bbba8 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9b2bbba8 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9b2bbba8 Branch: refs/heads/master Commit: 9b2bbba89c67b2e7afc197da7248cb78a11d0563 Parents: d6c1ef6 Author: Benjamin Mahler <[email protected]> Authored: Fri Sep 12 17:04:49 2014 -0700 Committer: Benjamin Mahler <[email protected]> Committed: Fri Sep 12 17:12:07 2014 -0700 ---------------------------------------------------------------------- src/tests/fault_tolerance_tests.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/9b2bbba8/src/tests/fault_tolerance_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/fault_tolerance_tests.cpp b/src/tests/fault_tolerance_tests.cpp index 80d7fcf..6f4171a 100644 --- a/src/tests/fault_tolerance_tests.cpp +++ b/src/tests/fault_tolerance_tests.cpp @@ -2254,7 +2254,7 @@ TEST_F(FaultToleranceTest, ReconcilePendingTasks) // We drop the _runTask dispatch to ensure the task remains // pending in the slave. - DROP_DISPATCH(slave.get(), &Slave::_runTask); + Future<Nothing> _runTask = DROP_DISPATCH(slave.get(), &Slave::_runTask); TaskInfo task1; task1.set_name("test task"); @@ -2268,6 +2268,8 @@ TEST_F(FaultToleranceTest, ReconcilePendingTasks) driver.launchTasks(offers.get()[0].id(), tasks1); + AWAIT_READY(_runTask); + Future<SlaveReregisteredMessage> slaveReregisteredMessage = FUTURE_PROTOBUF(SlaveReregisteredMessage(), _, _);
