You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2014/06/12 21:25:10 UTC
git commit: Fixed a flaky test:
SlaveTest.TerminatingSlaveDoesNotReregister.
Repository: mesos
Updated Branches:
refs/heads/master 5f7bb3277 -> ebee9afee
Fixed a flaky test: SlaveTest.TerminatingSlaveDoesNotReregister.
Review: https://reviews.apache.org/r/22472
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ebee9afe
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ebee9afe
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ebee9afe
Branch: refs/heads/master
Commit: ebee9afee7f6e5f04a5f259642c12eb0b99c35e0
Parents: 5f7bb32
Author: Yifan Gu <yi...@mesosphere.io>
Authored: Thu Jun 12 12:24:46 2014 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Thu Jun 12 12:24:47 2014 -0700
----------------------------------------------------------------------
src/tests/slave_tests.cpp | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ebee9afe/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index 2c8f183..974293b 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -741,17 +741,24 @@ TEST_F(SlaveTest, TerminatingSlaveDoesNotReregister)
MesosSchedulerDriver driver(
&sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
+ EXPECT_CALL(sched, registered(&driver, _, _))
+ .Times(1);
+
// Launch a task that uses less resource than the default(cpus:2, mem:1024).
EXPECT_CALL(sched, resourceOffers(_, _))
.WillOnce(LaunchTasks(DEFAULT_EXECUTOR_INFO, 1, 1, 64, "*"))
.WillRepeatedly(Return()); // Ignore subsequent offers.
+ EXPECT_CALL(exec, registered(_, _, _, _))
+ .Times(1);
+
EXPECT_CALL(exec, launchTask(_, _))
.WillOnce(SendStatusUpdateFromTask(TASK_RUNNING));
Future<TaskStatus> status;
- EXPECT_CALL(sched, statusUpdate(_, _))
- .WillOnce(FutureArg<1>(&status));
+ EXPECT_CALL(sched, statusUpdate(&driver, _))
+ .WillOnce(FutureArg<1>(&status))
+ .WillRepeatedly(Return()); // Ignore subsequent updates.
driver.start();