You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2014/05/23 23:48:55 UTC
git commit: Fixed the flaky SlaveRecovery MultipleFrameworks test.
Repository: mesos
Updated Branches:
refs/heads/master f751e3b6b -> cbaa94c96
Fixed the flaky SlaveRecovery MultipleFrameworks test.
Review: https://reviews.apache.org/r/21871
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/cbaa94c9
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/cbaa94c9
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/cbaa94c9
Branch: refs/heads/master
Commit: cbaa94c96543a68daa15f7598a64408db7662751
Parents: f751e3b
Author: Jie Yu <yu...@gmail.com>
Authored: Fri May 23 10:50:00 2014 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Fri May 23 14:48:34 2014 -0700
----------------------------------------------------------------------
src/tests/slave_recovery_tests.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/cbaa94c9/src/tests/slave_recovery_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp
index 6de811e..44ffac4 100644
--- a/src/tests/slave_recovery_tests.cpp
+++ b/src/tests/slave_recovery_tests.cpp
@@ -2691,7 +2691,7 @@ TYPED_TEST(SlaveRecoveryTest, MultipleFrameworks)
Future<vector<Offer> > offers1;
EXPECT_CALL(sched1, resourceOffers(_, _))
.WillOnce(FutureArg<1>(&offers1))
- .WillRepeatedly(Return()); // Ignore subsequent offers.
+ .WillRepeatedly(DeclineOffers()); // Ignore subsequent offers.
driver1.start();
@@ -2735,7 +2735,7 @@ TYPED_TEST(SlaveRecoveryTest, MultipleFrameworks)
Future<vector<Offer> > offers2;
EXPECT_CALL(sched2, resourceOffers(_, _))
.WillOnce(FutureArg<1>(&offers2))
- .WillRepeatedly(Return()); // Ignore subsequent offers.
+ .WillRepeatedly(DeclineOffers()); // Ignore subsequent offers.
driver2.start();