Updated Branches: refs/heads/master d57821e40 -> 8a79d3193
Fixed flaky FaultToleranceTest.IgnoreKillTaskFromUnregisteredFramework. Review: https://reviews.apache.org/r/17928 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8a79d319 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8a79d319 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8a79d319 Branch: refs/heads/master Commit: 8a79d31937a68d1c655ef8c7f94b69374d52a8c7 Parents: d57821e Author: Vinod Kone <[email protected]> Authored: Mon Feb 10 17:13:39 2014 -0800 Committer: Vinod Kone <[email protected]> Committed: Mon Feb 10 17:14:50 2014 -0800 ---------------------------------------------------------------------- src/tests/fault_tolerance_tests.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/8a79d319/src/tests/fault_tolerance_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/fault_tolerance_tests.cpp b/src/tests/fault_tolerance_tests.cpp index 60e06cc..130272c 100644 --- a/src/tests/fault_tolerance_tests.cpp +++ b/src/tests/fault_tolerance_tests.cpp @@ -1426,6 +1426,9 @@ TEST_F(FaultToleranceTest, IgnoreKillTaskFromUnregisteredFramework) EXPECT_CALL(sched1, statusUpdate(&driver1, _)) .WillOnce(FutureArg<1>(&status)); + Future<StatusUpdateAcknowledgementMessage> statusUpdateAcknowledgementMessage + = FUTURE_PROTOBUF(StatusUpdateAcknowledgementMessage(), _, _); + ExecutorDriver* execDriver; EXPECT_CALL(exec, registered(_, _, _, _)) .WillOnce(SaveArg<0>(&execDriver)); @@ -1438,6 +1441,11 @@ TEST_F(FaultToleranceTest, IgnoreKillTaskFromUnregisteredFramework) AWAIT_READY(status); EXPECT_EQ(TASK_RUNNING, status.get().state()); + // Wait for the status update acknowledgement to be sent. This + // ensures the slave doesn't resend the TASK_RUNNING update to the + // failed over scheduler (below). + AWAIT_READY(statusUpdateAcknowledgementMessage); + // Now start the second failed over scheduler. MockScheduler sched2;
