Repository: mesos Updated Branches: refs/heads/master 0bd9f2bb2 -> fe02e02cf
Fixed flaky SchedulerDriverEventTest.SubscribedSchedulerFailover test. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/fe02e02c Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/fe02e02c Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/fe02e02c Branch: refs/heads/master Commit: fe02e02cf7aa2363e808d6706874076156949c79 Parents: 0bd9f2b Author: Vinod Kone <[email protected]> Authored: Mon Jul 27 10:32:32 2015 -0700 Committer: Vinod Kone <[email protected]> Committed: Mon Jul 27 10:32:36 2015 -0700 ---------------------------------------------------------------------- src/tests/scheduler_event_call_tests.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/fe02e02c/src/tests/scheduler_event_call_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/scheduler_event_call_tests.cpp b/src/tests/scheduler_event_call_tests.cpp index b4dad18..898cbbb 100644 --- a/src/tests/scheduler_event_call_tests.cpp +++ b/src/tests/scheduler_event_call_tests.cpp @@ -314,12 +314,12 @@ TEST_F(SchedulerDriverEventTest, SubscribedSchedulerFailover) AWAIT_READY(frameworkRegisteredMessage); UPID frameworkPid2 = frameworkRegisteredMessage.get().to; - process::post(master.get(), frameworkPid2, event); - Future<Nothing> registered2; EXPECT_CALL(sched2, registered(&driver2, frameworkId, _)) .WillOnce(FutureSatisfy(®istered2)); + process::post(master.get(), frameworkPid2, event); + AWAIT_READY(registered2); }
