Repository: mesos Updated Branches: refs/heads/master 66aa122c5 -> 8c582614b
Fixed MasterAuthorizationTest.DuplicateReregistration test. Review: https://reviews.apache.org/r/27832 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8c582614 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8c582614 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8c582614 Branch: refs/heads/master Commit: 8c582614b9b08c7974da6200649656f9e40e59ed Parents: 66aa122 Author: Vinod Kone <[email protected]> Authored: Mon Nov 10 14:44:53 2014 -0800 Committer: Vinod Kone <[email protected]> Committed: Mon Nov 10 15:26:20 2014 -0800 ---------------------------------------------------------------------- src/tests/master_authorization_tests.cpp | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/8c582614/src/tests/master_authorization_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_authorization_tests.cpp b/src/tests/master_authorization_tests.cpp index 5ae855e..1273653 100644 --- a/src/tests/master_authorization_tests.cpp +++ b/src/tests/master_authorization_tests.cpp @@ -838,6 +838,9 @@ TEST_F(MasterAuthorizationTest, DuplicateReregistration) Return(promise3.future()))) .WillRepeatedly(Return(true)); // Authorize subsequent registration retries. + // Pause the clock to avoid re-registration retries. + Clock::pause(); + driver.start(); // Wait for the framework to be registered.
