Repository: mesos Updated Branches: refs/heads/master 9d5da8980 -> e1cd1bf92
Qualified MAX_REAP_INTERVAL with process:: in the tests. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9458fa88 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9458fa88 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9458fa88 Branch: refs/heads/master Commit: 9458fa88f709208b771efd6d6daeaaf032d56f79 Parents: 9d5da89 Author: Benjamin Mahler <[email protected]> Authored: Wed Sep 16 16:06:42 2015 -0700 Committer: Benjamin Mahler <[email protected]> Committed: Wed Sep 16 16:06:42 2015 -0700 ---------------------------------------------------------------------- src/tests/containerizer/launch_tests.cpp | 2 +- src/tests/slave_recovery_tests.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/9458fa88/src/tests/containerizer/launch_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/launch_tests.cpp b/src/tests/containerizer/launch_tests.cpp index cf36678..dbe891c 100644 --- a/src/tests/containerizer/launch_tests.cpp +++ b/src/tests/containerizer/launch_tests.cpp @@ -131,7 +131,7 @@ TEST_F(MesosContainerizerLaunchTest, ROOT_ChangeRootfs) // Advance time until the internal reaper reaps the subprocess. while (s.get().status().isPending()) { - Clock::advance(MAX_REAP_INTERVAL()); + Clock::advance(process::MAX_REAP_INTERVAL()); Clock::settle(); } http://git-wip-us.apache.org/repos/asf/mesos/blob/9458fa88/src/tests/slave_recovery_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp index 5aa67fb..fd285fb 100644 --- a/src/tests/slave_recovery_tests.cpp +++ b/src/tests/slave_recovery_tests.cpp @@ -587,7 +587,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverUnregisteredExecutor) // Now advance time until the reaper reaps the executor. while (status.isPending()) { - Clock::advance(MAX_REAP_INTERVAL()); + Clock::advance(process::MAX_REAP_INTERVAL()); Clock::settle(); } @@ -706,7 +706,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverTerminatedExecutor) // Now advance time until the reaper reaps the executor. while (status.isPending()) { - Clock::advance(MAX_REAP_INTERVAL()); + Clock::advance(process::MAX_REAP_INTERVAL()); Clock::settle(); } @@ -1000,7 +1000,7 @@ TYPED_TEST(SlaveRecoveryTest, CleanupExecutor) // Now advance time until the reaper reaps the executor. while (status.isPending()) { - Clock::advance(MAX_REAP_INTERVAL()); + Clock::advance(process::MAX_REAP_INTERVAL()); Clock::settle(); } @@ -1685,7 +1685,7 @@ TYPED_TEST(SlaveRecoveryTest, ShutdownSlave) // Now advance time until the reaper reaps the executor. while (executorTerminated.isPending()) { - Clock::advance(MAX_REAP_INTERVAL()); + Clock::advance(process::MAX_REAP_INTERVAL()); Clock::settle(); } @@ -2563,7 +2563,7 @@ TYPED_TEST(SlaveRecoveryTest, PartitionedSlave) // Wait for the executor to be terminated. while (executorTerminated.isPending()) { - Clock::advance(MAX_REAP_INTERVAL()); + Clock::advance(process::MAX_REAP_INTERVAL()); Clock::settle(); }
