mesos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tnac...@apache.org
Subject mesos git commit: Speed up SlaveTest.HTTPSchedulerSlaveRestart
Date Wed, 30 Dec 2015 08:13:59 GMT
Repository: mesos
Updated Branches:
  refs/heads/master 5386eaec0 -> 274c4abc9


Speed up SlaveTest.HTTPSchedulerSlaveRestart

Review: https://reviews.apache.org/r/41675/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/274c4abc
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/274c4abc
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/274c4abc

Branch: refs/heads/master
Commit: 274c4abc9b7dc2b70bcbb9bd3448c5125b8c52c3
Parents: 5386eae
Author: Jian Qiu <qiujian@cn.ibm.com>
Authored: Tue Dec 29 19:47:44 2015 -0800
Committer: Timothy Chen <tnachen@gmail.com>
Committed: Wed Dec 30 00:13:25 2015 -0800

----------------------------------------------------------------------
 src/tests/slave_tests.cpp | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/274c4abc/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index 68d7517..328c853 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -2953,6 +2953,10 @@ TEST_F(SlaveTest, HTTPSchedulerSlaveRestart)
   ASSERT_SOME(slave);
 
   Clock::settle();
+
+  // Ensure the slave considers itself recovered.
+  Clock::advance(slave::EXECUTOR_REREGISTER_TIMEOUT);
+
   Clock::resume();
 
   AWAIT_READY(slaveReregisteredMessage);


Mime
View raw message