Updated Branches: refs/heads/master e3df54c99 -> c5789a3e2
Fixed the flaky ReconcileTasksMissingFromSlave test. Review: https://reviews.apache.org/r/15254 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c5789a3e Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c5789a3e Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c5789a3e Branch: refs/heads/master Commit: c5789a3e21d0916525677e98f18cbdab5c7f916b Parents: e3df54c Author: Benjamin Mahler <bmah...@twitter.com> Authored: Tue Nov 5 17:08:37 2013 -0800 Committer: Benjamin Mahler <bmah...@twitter.com> Committed: Tue Nov 5 17:37:49 2013 -0800 ---------------------------------------------------------------------- src/tests/slave_recovery_tests.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/c5789a3e/src/tests/slave_recovery_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp index 37faf20..3ee7b87 100644 --- a/src/tests/slave_recovery_tests.cpp +++ b/src/tests/slave_recovery_tests.cpp @@ -2003,6 +2003,16 @@ TYPED_TEST(SlaveRecoveryTest, ReconcileTasksMissingFromSlave) Clock::resume(); + EXPECT_CALL(allocator, frameworkDeactivated(_)) + .WillRepeatedly(Return()); + EXPECT_CALL(allocator, frameworkRemoved(_)) + .WillRepeatedly(Return()); + + // If there was an outstanding offer, we can get a call to + // resourcesRecovered when we stop the scheduler. + EXPECT_CALL(allocator, resourcesRecovered(_, _, _)) + .WillRepeatedly(Return()); + driver.stop(); driver.join();
