You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ne...@apache.org on 2017/05/26 21:21:07 UTC
mesos git commit: Fixed flakiness in
MasterTest.EndpointsForHalfRemovedSlave.
Repository: mesos
Updated Branches:
refs/heads/master 7b9863faf -> e611b5478
Fixed flakiness in MasterTest.EndpointsForHalfRemovedSlave.
The test had a race between setting up an expectation and dispatching an
asynchronous operation that would satisfy the expectation (the former
needs to happen first).
Review: https://reviews.apache.org/r/59579
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e611b547
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e611b547
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e611b547
Branch: refs/heads/master
Commit: e611b5478fd8638323f2ff4824861fdb18ba5c68
Parents: 7b9863f
Author: Neil Conway <ne...@gmail.com>
Authored: Thu May 25 10:37:30 2017 -0700
Committer: Neil Conway <ne...@gmail.com>
Committed: Fri May 26 13:58:21 2017 -0700
----------------------------------------------------------------------
src/tests/master_tests.cpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e611b547/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index bacd44d..4ae367d 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -623,16 +623,18 @@ TEST_F(MasterTest, EndpointsForHalfRemovedSlave)
// Drop all the PONGs to simulate slave partition.
DROP_PROTOBUFS(PongSlaveMessage(), _, _);
+ Clock::pause();
+
+ Future<SlaveRegisteredMessage> slaveRegisteredMessage =
+ FUTURE_PROTOBUF(SlaveRegisteredMessage(), _, _);
+
slave::Flags agentFlags = CreateSlaveFlags();
Owned<MasterDetector> detector = master.get()->createDetector();
Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), agentFlags);
ASSERT_SOME(slave);
- Future<SlaveRegisteredMessage> slaveRegisteredMessage =
- FUTURE_PROTOBUF(SlaveRegisteredMessage(), _, _);
-
- Clock::pause();
Clock::advance(agentFlags.registration_backoff_factor);
+
AWAIT_READY(slaveRegisteredMessage);
// Now advance through the PINGs.