[1/2] git commit: Fixed the flaky MasterTest.RecoveredSlaveReregisters test.

[jieyu]

Repository: mesos
Updated Branches:
  refs/heads/master 1909a06e1 -> 5acea829b


Fixed the flaky MasterTest.RecoveredSlaveReregisters test.

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


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

Branch: refs/heads/master
Commit: 5acea829b243a9c7ce9001cfadd674ed93997c86
Parents: 00634d2
Author: Jie Yu <yujie....@gmail.com>
Authored: Tue Aug 5 14:15:05 2014 -0700
Committer: Jie Yu <yujie....@gmail.com>
Committed: Tue Aug 5 14:54:32 2014 -0700

----------------------------------------------------------------------
 src/tests/master_tests.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/5acea829/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index 5a1cf7f..87bd8c0 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -1721,8 +1721,14 @@ TEST_F(MasterTest, RecoveredSlaveReregisters)
   EXPECT_CALL(sched, registered(&driver, _, _))
     .WillOnce(FutureSatisfy(&registered));
 
+  // Ignore all offer related calls. The scheduler might receive
+  // offerRescinded calls because the slave might re-register due to
+  // ping timeout.
   EXPECT_CALL(sched, resourceOffers(&driver, _))
-    .WillRepeatedly(Return()); // Ignore offers.
+    .WillRepeatedly(Return());
+
+  EXPECT_CALL(sched, offerRescinded(&driver, _))
+    .WillRepeatedly(Return());
 
   driver.start();