You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by gr...@apache.org on 2017/09/13 17:55:37 UTC
[3/4] mesos git commit: Changed `EXPECT` to `ASSERT` when relying on
the assertion afterwards.
http://git-wip-us.apache.org/repos/asf/mesos/blob/2a6f6b7a/src/tests/slave_recovery_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp
index 0e46748..0cd2b5d 100644
--- a/src/tests/slave_recovery_tests.cpp
+++ b/src/tests/slave_recovery_tests.cpp
@@ -217,7 +217,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverSlaveState)
UPID frameworkPid = subscribeMessage->from;
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
SlaveID slaveId = offers.get()[0].slave_id();
@@ -388,7 +388,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverStatusUpdateManager)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -475,7 +475,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_ReconnectHTTPExecutor)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
// Launch a task with the HTTP based command executor.
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -608,7 +608,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_ROOT_CGROUPS_ReconnectDefaultExecutor)
executorInfo.mutable_framework_id()->CopyFrom(devolve(frameworkId));
AWAIT_READY(offers);
- EXPECT_FALSE(offers->offers().empty());
+ ASSERT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const SlaveID slaveId = devolve(offer.agent_id());
@@ -757,7 +757,7 @@ TYPED_TEST(SlaveRecoveryTest, ReconnectExecutor)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -851,7 +851,7 @@ TYPED_TEST(SlaveRecoveryTest, ReconnectExecutorRetry)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -970,7 +970,7 @@ TYPED_TEST(SlaveRecoveryTest, PingTimeoutDuringRecovery)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -1111,7 +1111,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_RecoverUnregisteredHTTPExecutor)
driver.start();
AWAIT_READY(offers1);
- EXPECT_FALSE(offers1->empty());
+ ASSERT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -1223,7 +1223,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverUnregisteredExecutor)
driver.start();
AWAIT_READY(offers1);
- EXPECT_FALSE(offers1->empty());
+ ASSERT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -1337,7 +1337,7 @@ TYPED_TEST(SlaveRecoveryTest, KillQueuedTaskDuringExecutorRegistration)
driver.start();
AWAIT_READY(offers1);
- EXPECT_FALSE(offers1->empty());
+ ASSERT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -1447,7 +1447,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverTerminatedHTTPExecutor)
driver.start();
AWAIT_READY(offers1);
- EXPECT_FALSE(offers1->empty());
+ ASSERT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -1588,7 +1588,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverTerminatedExecutor)
driver.start();
AWAIT_READY(offers1);
- EXPECT_FALSE(offers1->empty());
+ ASSERT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -1719,7 +1719,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_RecoveryTimeout)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -1811,7 +1811,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverCompletedExecutor)
driver.start();
AWAIT_READY(offers1);
- EXPECT_FALSE(offers1->empty());
+ ASSERT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "exit 0");
@@ -1905,7 +1905,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_CleanupHTTPExecutor)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
// Launch a task with the HTTP based command executor.
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -2006,7 +2006,7 @@ TYPED_TEST(SlaveRecoveryTest, CleanupExecutor)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -2107,7 +2107,7 @@ TYPED_TEST(SlaveRecoveryTest, RemoveNonCheckpointingFramework)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
// Launch 2 tasks from this offer.
vector<TaskInfo> tasks;
@@ -2222,7 +2222,7 @@ TYPED_TEST(SlaveRecoveryTest, NonCheckpointingFramework)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -2320,7 +2320,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_KillTaskWithHTTPExecutor)
driver.start();
AWAIT_READY(offers1);
- EXPECT_FALSE(offers1->empty());
+ ASSERT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -2435,7 +2435,7 @@ TYPED_TEST(SlaveRecoveryTest, KillTask)
driver.start();
AWAIT_READY(offers1);
- EXPECT_FALSE(offers1->empty());
+ ASSERT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -2553,7 +2553,7 @@ TYPED_TEST(SlaveRecoveryTest, Reboot)
driver.start();
AWAIT_READY(offers1);
- EXPECT_FALSE(offers1->empty());
+ ASSERT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -2927,7 +2927,7 @@ TYPED_TEST(SlaveRecoveryTest, GCExecutor)
driver.start();
AWAIT_READY(offers1);
- EXPECT_FALSE(offers1->empty());
+ ASSERT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -3064,7 +3064,7 @@ TYPED_TEST(SlaveRecoveryTest, ShutdownSlave)
AWAIT_READY(offers1);
- EXPECT_FALSE(offers1->empty());
+ ASSERT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -3129,7 +3129,7 @@ TYPED_TEST(SlaveRecoveryTest, ShutdownSlave)
// Ensure that the slave registered with a new id.
AWAIT_READY(offers3);
- EXPECT_FALSE(offers3->empty());
+ ASSERT_FALSE(offers3->empty());
// Make sure all slave resources are reoffered.
EXPECT_EQ(Resources(offers1.get()[0].resources()),
Resources(offers3.get()[0].resources()));
@@ -3182,7 +3182,7 @@ TYPED_TEST(SlaveRecoveryTest, ShutdownSlaveSIGUSR1)
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -3407,7 +3407,7 @@ TYPED_TEST(SlaveRecoveryTest, ReconcileKillTask)
driver.start();
AWAIT_READY(offers1);
- EXPECT_FALSE(offers1->empty());
+ ASSERT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -3508,7 +3508,7 @@ TYPED_TEST(SlaveRecoveryTest, ReconcileShutdownFramework)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
// Capture the framework id.
FrameworkID frameworkId = offers.get()[0].framework_id();
@@ -3654,7 +3654,7 @@ TYPED_TEST(SlaveRecoveryTest, ReconcileTasksMissingFromSlave)
driver.start();
AWAIT_READY(offers1);
- EXPECT_FALSE(offers1->empty());
+ ASSERT_FALSE(offers1->empty());
// Start a task on the slave so that the master has knowledge of it.
// We'll ensure the slave does not have this task when it
@@ -3819,7 +3819,7 @@ TYPED_TEST(SlaveRecoveryTest, SchedulerFailover)
AWAIT_READY(frameworkId);
AWAIT_READY(offers1);
- EXPECT_FALSE(offers1->empty());
+ ASSERT_FALSE(offers1->empty());
// Create a long running task.
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -3971,7 +3971,7 @@ TYPED_TEST(SlaveRecoveryTest, MasterFailover)
AWAIT_READY(frameworkRegisteredMessage);
AWAIT_READY(offers1);
- EXPECT_FALSE(offers1->empty());
+ ASSERT_FALSE(offers1->empty());
TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -4106,7 +4106,7 @@ TYPED_TEST(SlaveRecoveryTest, MultipleFrameworks)
driver1.start();
AWAIT_READY(offers1);
- EXPECT_FALSE(offers1->empty());
+ ASSERT_FALSE(offers1->empty());
// Use part of the resources in the offer so that the rest can be
// offered to framework 2.
@@ -4145,7 +4145,7 @@ TYPED_TEST(SlaveRecoveryTest, MultipleFrameworks)
driver2.start();
AWAIT_READY(offers2);
- EXPECT_FALSE(offers2->empty());
+ ASSERT_FALSE(offers2->empty());
// Framework 2 launches a task.
TaskInfo task2 = createTask(offers2.get()[0], "sleep 1000");
@@ -4439,7 +4439,7 @@ TYPED_TEST(SlaveRecoveryTest, RestartBeforeContainerizerLaunch)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -4541,7 +4541,7 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, ResourceStatistics)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -4646,7 +4646,7 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PidNamespaceForward)
driver.start();
AWAIT_READY(offers1);
- EXPECT_FALSE(offers1->empty());
+ ASSERT_FALSE(offers1->empty());
SlaveID slaveId = offers1.get()[0].slave_id();
@@ -4750,7 +4750,7 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PidNamespaceBackward)
driver.start();
AWAIT_READY(offers1);
- EXPECT_FALSE(offers1->empty());
+ ASSERT_FALSE(offers1->empty());
SlaveID slaveId = offers1.get()[0].slave_id();
http://git-wip-us.apache.org/repos/asf/mesos/blob/2a6f6b7a/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index 1bdadce..0a578ff 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -246,7 +246,7 @@ TEST_F(SlaveTest, DuplicateTerminalUpdateBeforeAck)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
ExecutorDriver* execDriver;
EXPECT_CALL(exec, registered(_, _, _, _))
@@ -360,7 +360,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, ShutdownUnregisteredExecutor)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
// Launch a task with the command executor.
TaskInfo task;
@@ -476,7 +476,7 @@ TEST_F(SlaveTest, ExecutorTimeoutCausedBySlowFetch)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
// Launch a task with the command executor.
// The task uses a URI that needs to be fetched by the HDFS client
@@ -575,7 +575,7 @@ TEST_F(SlaveTest, RemoveUnregisteredTerminatedExecutor)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
TaskInfo task;
task.set_name("");
@@ -661,7 +661,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, CommandTaskWithArguments)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
// Launch a task with the command executor.
TaskInfo task;
@@ -727,7 +727,7 @@ TEST_F(SlaveTest, CommandTaskWithKillPolicy)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
Offer offer = offers.get()[0];
TaskInfo task;
@@ -1025,7 +1025,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
// Launch a task with the command executor.
TaskInfo task;
@@ -1129,7 +1129,7 @@ TEST_F(SlaveTest, DISABLED_ROOT_RunTaskWithCommandInfoWithUser)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
// HACK: Launch a prepare task as root to prepare the binaries.
// This task creates the lt-mesos-executor binary in the build dir.
@@ -1181,7 +1181,7 @@ TEST_F(SlaveTest, DISABLED_ROOT_RunTaskWithCommandInfoWithUser)
.WillRepeatedly(Return()); // Ignore subsequent offers.
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
// Launch a task with the command executor.
TaskInfo task;
@@ -1257,7 +1257,7 @@ TEST_F(SlaveTest, IgnoreNonLeaderStatusUpdateAcknowledgement)
const UPID schedulerPid = frameworkRegisteredMessage->to;
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "", DEFAULT_EXECUTOR_ID);
@@ -1434,7 +1434,7 @@ TEST_F(SlaveTest, MetricsSlaveLaunchErrors)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
const Offer offer = offers.get()[0];
// Verify that we start with no launch failures.
@@ -1614,7 +1614,7 @@ TEST_F(SlaveTest, StateEndpoint)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
Resources executorResources = Resources::parse("cpus:0.1;mem:32").get();
executorResources.allocate("*");
@@ -1771,7 +1771,7 @@ TEST_F(SlaveTest, GetStateTaskGroupPending)
executorInfo.mutable_framework_id()->CopyFrom(devolve(frameworkId));
AWAIT_READY(offers);
- EXPECT_FALSE(offers->offers().empty());
+ ASSERT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const SlaveID slaveId = devolve(offer.agent_id());
@@ -2092,7 +2092,7 @@ TEST_F(SlaveTest, HTTPExecutorBadAuthentication)
executorInfo.mutable_framework_id()->CopyFrom(frameworkId);
AWAIT_READY(offers);
- EXPECT_FALSE(offers->offers().empty());
+ ASSERT_FALSE(offers->offers().empty());
Future<v1::executor::Mesos*> executorLib;
EXPECT_CALL(*executor, connected(_))
@@ -2264,7 +2264,7 @@ TEST_F(SlaveTest, StatisticsEndpointMissingStatistics)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -2370,7 +2370,7 @@ TEST_F(SlaveTest, StatisticsEndpointRunningExecutor)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -2933,7 +2933,7 @@ TEST_F(SlaveTest, TerminalTaskContainerizerUpdateFailsWithLost)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
Offer offer = offers.get()[0];
// Start two tasks.
@@ -3046,7 +3046,7 @@ TEST_F(SlaveTest, TerminalTaskContainerizerUpdateFailsWithGone)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
Offer offer = offers.get()[0];
// Start two tasks.
@@ -4015,7 +4015,7 @@ TEST_F(SlaveTest, KillTaskBetweenRunTaskParts)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
TaskInfo task;
task.set_name("");
@@ -4124,7 +4124,7 @@ TEST_F(SlaveTest, KillMultiplePendingTasks)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers->size());
+ ASSERT_FALSE(offers->empty());
// We only pause the clock after receiving the offer since the
// agent uses a delay to re-register.
@@ -4256,7 +4256,7 @@ TEST_F(SlaveTest, KillQueuedTaskDuringExecutorRegistration)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
TaskInfo task;
task.set_name("");
@@ -4379,7 +4379,7 @@ TEST_F(SlaveTest, KillTaskUnregisteredHTTPExecutor)
executorInfo.mutable_framework_id()->CopyFrom(devolve(frameworkId));
AWAIT_READY(offers);
- EXPECT_FALSE(offers->offers().empty());
+ ASSERT_FALSE(offers->offers().empty());
const v1::Offer& offer = offers->offers(0);
const SlaveID slaveId = devolve(offer.agent_id());
@@ -4607,7 +4607,7 @@ TEST_F(SlaveTest, ContainerizerUsageFailure)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
const Offer& offer = offers.get()[0];
@@ -4685,7 +4685,7 @@ TEST_F(SlaveTest, DiscoveryInfoAndPorts)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
TaskInfo task = createTask(
offers.get()[0],
@@ -4794,7 +4794,7 @@ TEST_F(SlaveTest, ExecutorLabels)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
TaskInfo task;
task.set_name("");
@@ -4886,7 +4886,7 @@ TEST_F(SlaveTest, TaskLabels)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
TaskInfo task;
task.set_name("");
@@ -4990,7 +4990,7 @@ TEST_F(SlaveTest, TaskStatusLabels)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
TaskInfo task = createTask(
offers.get()[0],
@@ -5095,7 +5095,7 @@ TEST_F(SlaveTest, TaskStatusContainerStatus)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
TaskInfo task = createTask(
offers.get()[0],
@@ -5193,7 +5193,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, ExecutorEnvironmentVariables)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
// Launch a task with the command executor.
TaskInfo task;
@@ -5530,7 +5530,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, HTTPSchedulerSlaveRestart)
FUTURE_MESSAGE(Eq(RegisterExecutorMessage().GetTypeName()), _, _);
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
SlaveID slaveId = offers.get()[0].slave_id();
@@ -5676,7 +5676,7 @@ TEST_F(SlaveTest, ExecutorShutdownGracePeriod)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
Offer offer = offers.get()[0];
// Customize executor shutdown grace period to be larger than the
@@ -5842,7 +5842,7 @@ TEST_F(SlaveTest, RunTaskGroup)
executorInfo.mutable_framework_id()->CopyFrom(devolve(frameworkId));
AWAIT_READY(offers);
- EXPECT_FALSE(offers->offers().empty());
+ ASSERT_FALSE(offers->offers().empty());
EXPECT_CALL(*executor, connected(_))
.WillOnce(v1::executor::SendSubscribe(frameworkId, evolve(executorId)));
@@ -7008,7 +7008,7 @@ TEST_F(SlaveTest, KillTaskGroupBetweenRunTaskParts)
executorInfo.mutable_framework_id()->CopyFrom(devolve(frameworkId));
AWAIT_READY(offers);
- EXPECT_FALSE(offers->offers().empty());
+ ASSERT_FALSE(offers->offers().empty());
EXPECT_CALL(*executor, connected(_))
.Times(0);
@@ -7206,7 +7206,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, DefaultExecutorCommandInfo)
executorInfo.mutable_framework_id()->CopyFrom(devolve(frameworkId));
AWAIT_READY(offers);
- EXPECT_FALSE(offers->offers().empty());
+ ASSERT_FALSE(offers->offers().empty());
Future<ContainerConfig> containerConfig;
EXPECT_CALL(containerizer, launch(_, _, _, _))
@@ -7321,7 +7321,7 @@ TEST_F(SlaveTest, KillQueuedTaskGroup)
executorInfo.mutable_framework_id()->CopyFrom(devolve(frameworkId));
AWAIT_READY(offers);
- EXPECT_FALSE(offers->offers().empty());
+ ASSERT_FALSE(offers->offers().empty());
Future<v1::executor::Mesos*> executorLibrary;
EXPECT_CALL(*executor, connected(_))
@@ -7639,7 +7639,7 @@ TEST_F(SlaveTest, ShutdownV0ExecutorIfItReregistersWithoutReconnect)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
EXPECT_CALL(exec, registered(_, _, _, _));
@@ -7742,7 +7742,7 @@ TEST_F(SlaveTest, IgnoreV0ExecutorIfItReregistersWithoutReconnect)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
EXPECT_CALL(exec, registered(_, _, _, _));
@@ -7844,7 +7844,7 @@ TEST_F(SlaveTest, DisconnectedExecutorDropsMessages)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
FrameworkID frameworkId = offers->front().framework_id();
@@ -7978,7 +7978,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, ExecutorReregistrationTimeoutFlag)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
TaskInfo task = createTask(offers->front(), "sleep 1000");
http://git-wip-us.apache.org/repos/asf/mesos/blob/2a6f6b7a/src/tests/status_update_manager_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/status_update_manager_tests.cpp b/src/tests/status_update_manager_tests.cpp
index 6922ee3..24d6a99 100644
--- a/src/tests/status_update_manager_tests.cpp
+++ b/src/tests/status_update_manager_tests.cpp
@@ -126,7 +126,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(StatusUpdateManagerTest, CheckpointStatusUpdate)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
EXPECT_CALL(exec, registered(_, _, _, _));
@@ -215,7 +215,7 @@ TEST_F(StatusUpdateManagerTest, RetryStatusUpdate)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
EXPECT_CALL(exec, registered(_, _, _, _));
@@ -286,7 +286,7 @@ TEST_F(StatusUpdateManagerTest, IgnoreDuplicateStatusUpdateAck)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
ExecutorDriver* execDriver;
EXPECT_CALL(exec, registered(_, _, _, _))
@@ -402,7 +402,7 @@ TEST_F(StatusUpdateManagerTest, IgnoreUnexpectedStatusUpdateAck)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
ExecutorDriver* execDriver;
EXPECT_CALL(exec, registered(_, _, _, _))
@@ -492,7 +492,7 @@ TEST_F(StatusUpdateManagerTest, DuplicateTerminalUpdateAfterAck)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
ExecutorDriver* execDriver;
EXPECT_CALL(exec, registered(_, _, _, _))
@@ -587,7 +587,7 @@ TEST_F(StatusUpdateManagerTest, DuplicateUpdateBeforeAck)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
ExecutorDriver* execDriver;
EXPECT_CALL(exec, registered(_, _, _, _))
@@ -772,7 +772,7 @@ TEST_F(StatusUpdateManagerTest, DuplicatedTerminalStatusUpdate)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
ExecutorDriver* execDriver;
EXPECT_CALL(exec, registered(_, _, _, _))
http://git-wip-us.apache.org/repos/asf/mesos/blob/2a6f6b7a/src/tests/teardown_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/teardown_tests.cpp b/src/tests/teardown_tests.cpp
index 8834333..5eada4f 100644
--- a/src/tests/teardown_tests.cpp
+++ b/src/tests/teardown_tests.cpp
@@ -349,7 +349,7 @@ TEST_F(TeardownTest, RecoveredFrameworkAfterMasterFailover)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_FALSE(offers->empty());
+ ASSERT_FALSE(offers->empty());
TaskInfo task = createTask(offers.get()[0], "sleep 100");