You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2014/06/24 01:51:51 UTC
git commit: Modified two slave recovery tests to deal with the cases
where 'update' in an isolator launches a subprocess.
Repository: mesos
Updated Branches:
refs/heads/master e0284d095 -> 44345e8f3
Modified two slave recovery tests to deal with the cases where 'update'
in an isolator launches a subprocess.
Review: https://reviews.apache.org/r/22900
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/44345e8f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/44345e8f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/44345e8f
Branch: refs/heads/master
Commit: 44345e8f341f6178014a9229f899869e16ab9799
Parents: e0284d0
Author: Jie Yu <yu...@gmail.com>
Authored: Mon Jun 9 10:20:14 2014 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Mon Jun 23 16:50:24 2014 -0700
----------------------------------------------------------------------
src/tests/slave_recovery_tests.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/44345e8f/src/tests/slave_recovery_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp
index 9274b1a..582f52d 100644
--- a/src/tests/slave_recovery_tests.cpp
+++ b/src/tests/slave_recovery_tests.cpp
@@ -1331,8 +1331,6 @@ TYPED_TEST(SlaveRecoveryTest, KillTask)
// Wait for the slave to re-register.
AWAIT_READY(slaveReregisteredMessage);
- Clock::pause();
-
Future<TaskStatus> status;
EXPECT_CALL(sched, statusUpdate(_, _))
.WillOnce(FutureArg<1>(&status))
@@ -1350,6 +1348,8 @@ TYPED_TEST(SlaveRecoveryTest, KillTask)
AWAIT_READY(status);
ASSERT_EQ(TASK_KILLED, status.get().state());
+ Clock::pause();
+
// Advance the clock until the allocator allocates
// the recovered resources.
while (offers2.isPending()) {
@@ -2455,8 +2455,6 @@ TYPED_TEST(SlaveRecoveryTest, SchedulerFailover)
.WillOnce(FutureArg<1>(&offers2))
.WillRepeatedly(Return()); // Ignore subsequent offers.
- Clock::pause();
-
// Kill the task.
driver2.killTask(task.task_id());
@@ -2464,6 +2462,8 @@ TYPED_TEST(SlaveRecoveryTest, SchedulerFailover)
AWAIT_READY(status);
ASSERT_EQ(TASK_KILLED, status.get().state());
+ Clock::pause();
+
// Advance the clock until the allocator allocates
// the recovered resources.
while (offers2.isPending()) {