You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2015/09/11 03:59:05 UTC
mesos git commit: Fixed flaky
ReservationEndpointsTest.AvailableResources test.
Repository: mesos
Updated Branches:
refs/heads/master cc0b6ea87 -> 81efd727e
Fixed flaky ReservationEndpointsTest.AvailableResources test.
Review: https://reviews.apache.org/r/38282
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/81efd727
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/81efd727
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/81efd727
Branch: refs/heads/master
Commit: 81efd727eb3087378c33a84cc3fd315f31f2edc5
Parents: cc0b6ea
Author: Michael Park <mc...@gmail.com>
Authored: Thu Sep 10 18:22:05 2015 -0700
Committer: Michael Park <mp...@apache.org>
Committed: Thu Sep 10 18:22:06 2015 -0700
----------------------------------------------------------------------
src/tests/reservation_endpoints_tests.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/81efd727/src/tests/reservation_endpoints_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/reservation_endpoints_tests.cpp b/src/tests/reservation_endpoints_tests.cpp
index 795f1cf..dfab497 100644
--- a/src/tests/reservation_endpoints_tests.cpp
+++ b/src/tests/reservation_endpoints_tests.cpp
@@ -180,6 +180,11 @@ TEST_F(ReservationEndpointsTest, AvailableResources)
EXPECT_TRUE(Resources(offer.resources()).contains(dynamicallyReserved));
+ Future<Nothing> recoverResources;
+ EXPECT_CALL(allocator, recoverResources(_, _, _, _))
+ .WillOnce(DoAll(InvokeRecoverResources(&allocator),
+ FutureSatisfy(&recoverResources)));
+
// The filter to decline the offer "forever".
Filters filtersForever;
filtersForever.set_refuse_seconds(1000);
@@ -187,11 +192,6 @@ TEST_F(ReservationEndpointsTest, AvailableResources)
// Decline the offer "forever" in order to deallocate resources.
driver.declineOffer(offer.id(), filtersForever);
- Future<Nothing> recoverResources;
- EXPECT_CALL(allocator, recoverResources(_, _, _, _))
- .WillOnce(DoAll(InvokeRecoverResources(&allocator),
- FutureSatisfy(&recoverResources)));
-
AWAIT_READY(recoverResources);
EXPECT_CALL(sched, resourceOffers(&driver, _))