Squelched GMock warning in MasterTest.RecoveredSlaveCanReregister. After the slave reregisters, the framework might receive an offer for the resources on that slave.
Review: https://reviews.apache.org/r/51956/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/89a78b87 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/89a78b87 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/89a78b87 Branch: refs/heads/master Commit: 89a78b873f5751714fefc7e97e1249e094d1e68a Parents: 905204e Author: Neil Conway <neil.con...@gmail.com> Authored: Mon Sep 19 15:49:29 2016 -0700 Committer: Vinod Kone <vinodk...@gmail.com> Committed: Mon Sep 19 15:49:29 2016 -0700 ---------------------------------------------------------------------- src/tests/master_tests.cpp | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/89a78b87/src/tests/master_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp index a32ac12..e6c8362 100644 --- a/src/tests/master_tests.cpp +++ b/src/tests/master_tests.cpp @@ -1956,11 +1956,17 @@ TEST_F(MasterTest, RecoveredSlaveCanReregister) Future<SlaveReregisteredMessage> slaveReregisteredMessage = FUTURE_PROTOBUF(SlaveReregisteredMessage(), master.get()->pid, _); + // Expect a resource offer from the re-registered slave. + Future<Nothing> offers; + EXPECT_CALL(sched, resourceOffers(&driver, _)) + .WillOnce(FutureSatisfy(&offers)); + detector = master.get()->createDetector(); slave = StartSlave(detector.get(), slaveFlags); ASSERT_SOME(slave); AWAIT_READY(slaveReregisteredMessage); + AWAIT_READY(offers); driver.stop(); driver.join();
