Repository: mesos Updated Branches: refs/heads/master 43e4446c6 -> dd66eb42d
Fixed line wrapping in tests. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/dd66eb42 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/dd66eb42 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/dd66eb42 Branch: refs/heads/master Commit: dd66eb42d545a5ac3fcd263339f7541d4583853a Parents: 43e4446 Author: Vinod Kone <[email protected]> Authored: Thu Sep 3 20:01:16 2015 -0700 Committer: Vinod Kone <[email protected]> Committed: Thu Sep 3 20:01:16 2015 -0700 ---------------------------------------------------------------------- src/tests/partition_tests.cpp | 18 +++++++++++++----- src/tests/slave_recovery_tests.cpp | 3 ++- src/tests/slave_tests.cpp | 9 ++++++--- 3 files changed, 21 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/dd66eb42/src/tests/partition_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/partition_tests.cpp b/src/tests/partition_tests.cpp index 9356c0b..9a87d9f 100644 --- a/src/tests/partition_tests.cpp +++ b/src/tests/partition_tests.cpp @@ -76,7 +76,8 @@ TEST_F(PartitionTest, PartitionedSlave) // Set these expectations up before we spawn the slave so that we // don't miss the first PING. - Future<Message> ping = FUTURE_MESSAGE(Eq(PingSlaveMessage().GetTypeName()), _, _); + Future<Message> ping = FUTURE_MESSAGE( + Eq(PingSlaveMessage().GetTypeName()), _, _); // Drop all the PONGs to simulate slave partition. DROP_MESSAGES(Eq(PongSlaveMessage().GetTypeName()), _, _); @@ -160,7 +161,9 @@ TEST_F(PartitionTest, PartitionedSlaveReregistration) // from the slave. Note that we don't match on the master / slave // PIDs because it's actually the SlaveObserver Process that sends // the pings. - Future<Message> ping = FUTURE_MESSAGE(Eq(PingSlaveMessage().GetTypeName()), _, _); + Future<Message> ping = FUTURE_MESSAGE( + Eq(PingSlaveMessage().GetTypeName()), _, _); + DROP_MESSAGES(Eq(PongSlaveMessage().GetTypeName()), _, _); MockExecutor exec(DEFAULT_EXECUTOR_ID); @@ -309,7 +312,9 @@ TEST_F(PartitionTest, PartitionedSlaveStatusUpdates) // from the slave. Note that we don't match on the master / slave // PIDs because it's actually the SlaveObserver Process that sends // the pings. - Future<Message> ping = FUTURE_MESSAGE(Eq(PingSlaveMessage().GetTypeName()), _, _); + Future<Message> ping = FUTURE_MESSAGE( + Eq(PingSlaveMessage().GetTypeName()), _, _); + DROP_MESSAGES(Eq(PongSlaveMessage().GetTypeName()), _, _); Future<SlaveRegisteredMessage> slaveRegisteredMessage = @@ -427,7 +432,9 @@ TEST_F(PartitionTest, PartitionedSlaveExitedExecutor) // from the slave. Note that we don't match on the master / slave // PIDs because it's actually the SlaveObserver Process that sends // the pings. - Future<Message> ping = FUTURE_MESSAGE(Eq(PingSlaveMessage().GetTypeName()), _, _); + Future<Message> ping = FUTURE_MESSAGE( + Eq(PingSlaveMessage().GetTypeName()), _, _); + DROP_MESSAGES(Eq(PongSlaveMessage().GetTypeName()), _, _); MockExecutor exec(DEFAULT_EXECUTOR_ID); @@ -556,7 +563,8 @@ TEST_F(PartitionTest, OneWayPartitionMasterToSlave) FUTURE_MESSAGE(Eq(SlaveRegisteredMessage().GetTypeName()), _, _); // Ensure a ping reaches the slave. - Future<Message> ping = FUTURE_MESSAGE(Eq(PingSlaveMessage().GetTypeName()), _, _); + Future<Message> ping = FUTURE_MESSAGE( + Eq(PingSlaveMessage().GetTypeName()), _, _); Try<PID<Slave>> slave = StartSlave(); ASSERT_SOME(slave); http://git-wip-us.apache.org/repos/asf/mesos/blob/dd66eb42/src/tests/slave_recovery_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp index 234e60d..6aae14a 100644 --- a/src/tests/slave_recovery_tests.cpp +++ b/src/tests/slave_recovery_tests.cpp @@ -2469,7 +2469,8 @@ TYPED_TEST(SlaveRecoveryTest, PartitionedSlave) // Set these expectations up before we spawn the slave so that we // don't miss the first PING. - Future<Message> ping = FUTURE_MESSAGE(Eq(PingSlaveMessage().GetTypeName()), _, _); + Future<Message> ping = FUTURE_MESSAGE( + Eq(PingSlaveMessage().GetTypeName()), _, _); // Drop all the PONGs to simulate slave partition. DROP_MESSAGES(Eq(PongSlaveMessage().GetTypeName()), _, _); http://git-wip-us.apache.org/repos/asf/mesos/blob/dd66eb42/src/tests/slave_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp index 6bc0cba..5c1a3d3 100644 --- a/src/tests/slave_tests.cpp +++ b/src/tests/slave_tests.cpp @@ -1562,7 +1562,8 @@ TEST_F(SlaveTest, PingTimeoutSomePings) Clock::pause(); // Ensure a ping reaches the slave. - Future<Message> ping = FUTURE_MESSAGE(Eq(PingSlaveMessage().GetTypeName()), _, _); + Future<Message> ping = FUTURE_MESSAGE( + Eq(PingSlaveMessage().GetTypeName()), _, _); Clock::advance(masterFlags.slave_ping_timeout); @@ -1598,7 +1599,8 @@ TEST_F(SlaveTest, RateLimitSlaveShutdown) // Set these expectations up before we spawn the slave so that we // don't miss the first PING. - Future<Message> ping = FUTURE_MESSAGE(Eq(PingSlaveMessage().GetTypeName()), _, _); + Future<Message> ping = FUTURE_MESSAGE( + Eq(PingSlaveMessage().GetTypeName()), _, _); // Drop all the PONGs to simulate health check timeout. DROP_MESSAGES(Eq(PongSlaveMessage().GetTypeName()), _, _); @@ -1662,7 +1664,8 @@ TEST_F(SlaveTest, CancelSlaveShutdown) // Set these expectations up before we spawn the slave so that we // don't miss the first PING. - Future<Message> ping = FUTURE_MESSAGE(Eq(PingSlaveMessage().GetTypeName()), _, _); + Future<Message> ping = FUTURE_MESSAGE( + Eq(PingSlaveMessage().GetTypeName()), _, _); // Drop all the PONGs to simulate health check timeout. DROP_MESSAGES(Eq(PongSlaveMessage().GetTypeName()), _, _);
