Repository: mesos Updated Branches: refs/heads/master 348fabbbf -> 053f677ef
Fixed flaky MasterAuthorizationTest.DuplicateRegistration test. Review: https://reviews.apache.org/r/37202 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/053f677e Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/053f677e Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/053f677e Branch: refs/heads/master Commit: 053f677ef1f9463561fbb16155a09b11c2b769bb Parents: 348fabb Author: Vinod Kone <[email protected]> Authored: Thu Aug 6 16:30:28 2015 -0700 Committer: Vinod Kone <[email protected]> Committed: Thu Aug 6 16:30:51 2015 -0700 ---------------------------------------------------------------------- src/tests/master_authorization_tests.cpp | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/053f677e/src/tests/master_authorization_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_authorization_tests.cpp b/src/tests/master_authorization_tests.cpp index e2dc093..f3f0cc8 100644 --- a/src/tests/master_authorization_tests.cpp +++ b/src/tests/master_authorization_tests.cpp @@ -766,6 +766,9 @@ TEST_F(MasterAuthorizationTest, DuplicateRegistration) Return(promise2.future()))) .WillRepeatedly(Return(true)); // Authorize subsequent registration retries. + // Pause the clock to avoid registration retries. + Clock::pause(); + driver.start(); // Wait until first authorization attempt is in progress.
