Repository: mesos Updated Branches: refs/heads/master 76861c527 -> 9d5da8980
Removed old hard-coded instances of the reap interval. Review: https://reviews.apache.org/r/38046 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9d5da898 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9d5da898 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9d5da898 Branch: refs/heads/master Commit: 9d5da898017e94d6a3bf8555c69b073953eed3ae Parents: 76861c5 Author: Guangya Liu <[email protected]> Authored: Wed Sep 16 16:01:25 2015 -0700 Committer: Benjamin Mahler <[email protected]> Committed: Wed Sep 16 16:01:25 2015 -0700 ---------------------------------------------------------------------- src/tests/containerizer/launch_tests.cpp | 2 +- src/tests/slave_recovery_tests.cpp | 10 +++++----- src/tests/slave_tests.cpp | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/9d5da898/src/tests/containerizer/launch_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/launch_tests.cpp b/src/tests/containerizer/launch_tests.cpp index d211fc0..cf36678 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(Seconds(1)); + Clock::advance(MAX_REAP_INTERVAL()); Clock::settle(); } http://git-wip-us.apache.org/repos/asf/mesos/blob/9d5da898/src/tests/slave_recovery_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp index dd8f823..5aa67fb 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(Seconds(1)); + Clock::advance(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(Seconds(1)); + Clock::advance(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(Seconds(1)); + Clock::advance(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(Seconds(1)); + Clock::advance(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(Seconds(1)); + Clock::advance(MAX_REAP_INTERVAL()); Clock::settle(); } http://git-wip-us.apache.org/repos/asf/mesos/blob/9d5da898/src/tests/slave_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp index 447c43c..4a1a586 100644 --- a/src/tests/slave_tests.cpp +++ b/src/tests/slave_tests.cpp @@ -33,6 +33,7 @@ #include <process/future.hpp> #include <process/gmock.hpp> #include <process/pid.hpp> +#include <process/reap.hpp> #include <process/subprocess.hpp> #include <stout/option.hpp> @@ -223,7 +224,7 @@ TEST_F(SlaveTest, ShutdownUnregisteredExecutor) // Now advance time until the reaper reaps the executor. while (status.isPending()) { - Clock::advance(Seconds(1)); + Clock::advance(process::MAX_REAP_INTERVAL()); Clock::settle(); }
