mesos git commit: Handled all possible offers in FaultToleranceTest.FrameworkReregister.

[al...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master d35c7c553 -> 0dfaec90e


Handled all possible offers in FaultToleranceTest.FrameworkReregister.

The test FaultToleranceTest.FrameworkReregister observes a single
offer in order to monitor progress and as a trigger to initiate other
actions later in the test. This change installs expectations for
possible additional offers. This allows for the thread running the
test body to be delayed with respect to the master thread which could
in the meantime make additional offers.

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


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

Branch: refs/heads/master
Commit: 0dfaec90edac3de28dbdd9b6a96a6098ac026a03
Parents: d35c7c5
Author: Benjamin Bannier <be...@mesosphere.io>
Authored: Thu Dec 22 16:17:39 2016 +0100
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Thu Dec 22 16:22:34 2016 +0100

----------------------------------------------------------------------
 src/tests/fault_tolerance_tests.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/0dfaec90/src/tests/fault_tolerance_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/fault_tolerance_tests.cpp b/src/tests/fault_tolerance_tests.cpp
index c43b234..24747fa 100644
--- a/src/tests/fault_tolerance_tests.cpp
+++ b/src/tests/fault_tolerance_tests.cpp
@@ -839,7 +839,8 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(FaultToleranceTest, FrameworkReregister)
 
   Future<Nothing> resourceOffers2;
   EXPECT_CALL(sched, resourceOffers(&driver, _))
-    .WillOnce(FutureSatisfy(&resourceOffers2));
+    .WillOnce(FutureSatisfy(&resourceOffers2))
+    .WillRepeatedly(Return()); // Ignore subsequent offers.
 
   EXPECT_CALL(sched, offerRescinded(&driver, _))
     .Times(AtMost(1));