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/08/06 02:19:35 UTC
git commit: Fixed two flaky tests in GarbageCollectorIntegrationTest.
Repository: mesos
Updated Branches:
refs/heads/master df05b63f1 -> 62dfd65d5
Fixed two flaky tests in GarbageCollectorIntegrationTest.
Review: https://reviews.apache.org/r/24350
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/62dfd65d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/62dfd65d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/62dfd65d
Branch: refs/heads/master
Commit: 62dfd65d54b108e0c63b8b1c7e40e4dc6adaa1cd
Parents: df05b63
Author: Jie Yu <yu...@gmail.com>
Authored: Tue Aug 5 15:17:27 2014 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue Aug 5 17:19:24 2014 -0700
----------------------------------------------------------------------
src/tests/gc_tests.cpp | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/62dfd65d/src/tests/gc_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/gc_tests.cpp b/src/tests/gc_tests.cpp
index df15746..f7747e2 100644
--- a/src/tests/gc_tests.cpp
+++ b/src/tests/gc_tests.cpp
@@ -283,6 +283,11 @@ TEST_F(GarbageCollectorIntegrationTest, Restart)
.WillOnce(LaunchTasks(DEFAULT_EXECUTOR_INFO, 1, cpus, mem, "*"))
.WillRepeatedly(Return()); // Ignore subsequent offers.
+ // Ignore offerRescinded calls. The scheduler might receive it
+ // because the slave might re-register due to ping timeout.
+ EXPECT_CALL(sched, offerRescinded(_, _))
+ .WillRepeatedly(Return());
+
EXPECT_CALL(exec, registered(_, _, _, _))
.Times(1);
@@ -500,6 +505,11 @@ TEST_F(GarbageCollectorIntegrationTest, ExitedExecutor)
.WillOnce(LaunchTasks(DEFAULT_EXECUTOR_INFO, 1, cpus, mem, "*"))
.WillRepeatedly(Return()); // Ignore subsequent offers.
+ // Ignore offerRescinded calls. The scheduler might receive it
+ // because the slave might re-register due to ping timeout.
+ EXPECT_CALL(sched, offerRescinded(_, _))
+ .WillRepeatedly(Return());
+
EXPECT_CALL(exec, registered(_, _, _, _))
.Times(1);