Repository: mesos Updated Branches: refs/heads/master b8da3f67d -> bc2062791
Fixed flakiness in SlaveAuthorizerTest.ViewFlags. Review: https://reviews.apache.org/r/50338/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b017d706 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b017d706 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b017d706 Branch: refs/heads/master Commit: b017d706ef5fd07ffca42f83069b122b52d584b2 Parents: b8da3f6 Author: Neil Conway <neil.con...@gmail.com> Authored: Wed Jul 27 16:58:37 2016 -0700 Committer: Vinod Kone <vinodk...@gmail.com> Committed: Wed Jul 27 16:58:37 2016 -0700 ---------------------------------------------------------------------- src/tests/slave_authorization_tests.cpp | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/b017d706/src/tests/slave_authorization_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_authorization_tests.cpp b/src/tests/slave_authorization_tests.cpp index f76ed3a..4a66126 100644 --- a/src/tests/slave_authorization_tests.cpp +++ b/src/tests/slave_authorization_tests.cpp @@ -24,6 +24,7 @@ #include <mesos/module/authorizer.hpp> +#include <process/clock.hpp> #include <process/http.hpp> #include <process/owned.hpp> @@ -46,6 +47,7 @@ using mesos::internal::slave::Slave; using mesos::master::detector::MasterDetector; using mesos::master::detector::StandaloneMasterDetector; +using process::Clock; using process::Future; using process::Owned; @@ -296,6 +298,11 @@ TYPED_TEST(SlaveAuthorizerTest, ViewFlags) ASSERT_SOME(agent); + // Ensure that the slave has finished recovery. + Clock::pause(); + Clock::settle(); + Clock::resume(); + // The default principal should be able to access the flags. { Future<Response> response = http::get(
