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 2013/11/19 23:19:37 UTC
git commit: Fixed a flaky test: SlaveRecoveryTest.ShutdownSlave.
Updated Branches:
refs/heads/master f9d1dd819 -> 6101c6b09
Fixed a flaky test: SlaveRecoveryTest.ShutdownSlave.
Review: https://reviews.apache.org/r/15664
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6101c6b0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6101c6b0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6101c6b0
Branch: refs/heads/master
Commit: 6101c6b0962ee603ce858b04e205f63aff1b6a0a
Parents: f9d1dd8
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Mon Nov 18 18:02:23 2013 -0800
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Tue Nov 19 14:05:31 2013 -0800
----------------------------------------------------------------------
src/tests/slave_recovery_tests.cpp | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/6101c6b0/src/tests/slave_recovery_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp
index eb2dc33..3c677e6 100644
--- a/src/tests/slave_recovery_tests.cpp
+++ b/src/tests/slave_recovery_tests.cpp
@@ -1501,9 +1501,10 @@ TYPED_TEST(SlaveRecoveryTest, ShutdownSlave)
EXPECT_CALL(sched, registered(_, _, _));
Future<vector<Offer> > offers1;
+ Future<vector<Offer> > offers2;
EXPECT_CALL(sched, resourceOffers(_, _))
- .WillOnce(FutureArg<1>(&offers1))
- .WillOnce(Return()); // Ignore the offer when slave is shutting down.
+ .WillOnce(FutureArg<1>(&offers1)) // Initial offer.
+ .WillOnce(FutureArg<1>(&offers2)); // Task resources re-offered.
driver.start();
@@ -1550,14 +1551,15 @@ TYPED_TEST(SlaveRecoveryTest, ShutdownSlave)
}
AWAIT_READY(executorTerminated);
+ AWAIT_READY(offers2);
Clock::resume();
this->Stop(slave.get(), true); // Send a "shut down".
- Future<vector<Offer> > offers2;
+ Future<vector<Offer> > offers3;
EXPECT_CALL(sched, resourceOffers(_, _))
- .WillOnce(FutureArg<1>(&offers2))
+ .WillOnce(FutureArg<1>(&offers3))
.WillRepeatedly(Return()); // Ignore subsequent offers.
// Now restart the slave (use same flags) with a new isolator.
@@ -1567,16 +1569,16 @@ TYPED_TEST(SlaveRecoveryTest, ShutdownSlave)
ASSERT_SOME(slave);
// Ensure that the slave registered with a new id.
- AWAIT_READY(offers2);
+ AWAIT_READY(offers3);
- EXPECT_NE(0u, offers2.get().size());
+ EXPECT_NE(0u, offers3.get().size());
// Make sure all slave resources are reoffered.
ASSERT_EQ(Resources(offers1.get()[0].resources()),
- Resources(offers2.get()[0].resources()));
+ Resources(offers3.get()[0].resources()));
// Ensure the slave id is different.
ASSERT_NE(
- offers1.get()[0].slave_id().value(), offers2.get()[0].slave_id().value());
+ offers1.get()[0].slave_id().value(), offers3.get()[0].slave_id().value());
driver.stop();
driver.join();