Repository: mesos Updated Branches: refs/heads/master dd647025b -> 44682979f
Fixed MasterAuthorizationTest.FrameworkRemovedBeforeRegistration test. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/44682979 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/44682979 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/44682979 Branch: refs/heads/master Commit: 44682979fbe53667e4a2f6bfe50e90f473e74141 Parents: dd64702 Author: Vinod Kone <[email protected]> Authored: Mon Nov 10 17:53:04 2014 -0800 Committer: Vinod Kone <[email protected]> Committed: Mon Nov 10 17:53:34 2014 -0800 ---------------------------------------------------------------------- src/tests/master_authorization_tests.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/44682979/src/tests/master_authorization_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_authorization_tests.cpp b/src/tests/master_authorization_tests.cpp index 1273653..aafa724 100644 --- a/src/tests/master_authorization_tests.cpp +++ b/src/tests/master_authorization_tests.cpp @@ -907,6 +907,9 @@ TEST_F(MasterAuthorizationTest, FrameworkRemovedBeforeRegistration) Return(promise.future()))) .WillRepeatedly(Return(true)); // Authorize subsequent registration retries. + // Pause the clock to avoid scheduler registration retries. + Clock::pause(); + driver.start(); // Wait until authorization is in progress. @@ -920,7 +923,6 @@ TEST_F(MasterAuthorizationTest, FrameworkRemovedBeforeRegistration) // Settle the clock here to ensure master handles the framework // 'exited' event. - Clock::pause(); Clock::settle(); Clock::resume();
