You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2017/03/13 22:19:31 UTC
[3/8] mesos git commit: Replace `.get().` in favor of the `->`
operator in tests.
http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/partition_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/partition_tests.cpp b/src/tests/partition_tests.cpp
index 2f5c694..3de37d2 100644
--- a/src/tests/partition_tests.cpp
+++ b/src/tests/partition_tests.cpp
@@ -211,7 +211,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, ReregisterSlavePartitionAware)
Clock::advance(agentFlags.registration_backoff_factor);
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- ASSERT_FALSE(offers.get().empty());
+ ASSERT_FALSE(offers->empty());
Offer offer = offers.get()[0];
@@ -227,10 +227,10 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, ReregisterSlavePartitionAware)
driver.launchTasks(offer.id(), {task});
AWAIT_READY(runningStatus);
- EXPECT_EQ(TASK_RUNNING, runningStatus.get().state());
- EXPECT_EQ(task.task_id(), runningStatus.get().task_id());
+ EXPECT_EQ(TASK_RUNNING, runningStatus->state());
+ EXPECT_EQ(task.task_id(), runningStatus->task_id());
- const SlaveID& slaveId = runningStatus.get().slave_id();
+ const SlaveID& slaveId = runningStatus->slave_id();
AWAIT_READY(statusUpdateAck);
@@ -260,10 +260,10 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, ReregisterSlavePartitionAware)
Clock::advance(masterFlags.agent_ping_timeout);
AWAIT_READY(unreachableStatus);
- EXPECT_EQ(TASK_UNREACHABLE, unreachableStatus.get().state());
- EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, unreachableStatus.get().reason());
- EXPECT_EQ(task.task_id(), unreachableStatus.get().task_id());
- EXPECT_EQ(slaveId, unreachableStatus.get().slave_id());
+ EXPECT_EQ(TASK_UNREACHABLE, unreachableStatus->state());
+ EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, unreachableStatus->reason());
+ EXPECT_EQ(task.task_id(), unreachableStatus->task_id());
+ EXPECT_EQ(slaveId, unreachableStatus->slave_id());
AWAIT_READY(slaveLost);
@@ -407,8 +407,8 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, ReregisterSlavePartitionAware)
driver.reconcileTasks({status});
AWAIT_READY(reconcileUpdate);
- EXPECT_EQ(TASK_RUNNING, reconcileUpdate.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate.get().reason());
+ EXPECT_EQ(TASK_RUNNING, reconcileUpdate->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate->reason());
Clock::resume();
@@ -568,7 +568,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, ReregisterSlaveNotPartitionAware)
Clock::advance(agentFlags.registration_backoff_factor);
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- ASSERT_FALSE(offers.get().empty());
+ ASSERT_FALSE(offers->empty());
Offer offer = offers.get()[0];
@@ -584,10 +584,10 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, ReregisterSlaveNotPartitionAware)
driver.launchTasks(offer.id(), {task});
AWAIT_READY(runningStatus);
- EXPECT_EQ(TASK_RUNNING, runningStatus.get().state());
- EXPECT_EQ(task.task_id(), runningStatus.get().task_id());
+ EXPECT_EQ(TASK_RUNNING, runningStatus->state());
+ EXPECT_EQ(task.task_id(), runningStatus->task_id());
- const SlaveID& slaveId = runningStatus.get().slave_id();
+ const SlaveID& slaveId = runningStatus->slave_id();
AWAIT_READY(statusUpdateAck);
@@ -626,11 +626,11 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, ReregisterSlaveNotPartitionAware)
// The scheduler should see TASK_LOST because it is not
// PARTITION_AWARE.
AWAIT_READY(lostStatus);
- EXPECT_EQ(TASK_LOST, lostStatus.get().state());
- EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, lostStatus.get().reason());
- EXPECT_EQ(task.task_id(), lostStatus.get().task_id());
- EXPECT_EQ(slaveId, lostStatus.get().slave_id());
- EXPECT_EQ(partitionTime, lostStatus.get().unreachable_time());
+ EXPECT_EQ(TASK_LOST, lostStatus->state());
+ EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, lostStatus->reason());
+ EXPECT_EQ(task.task_id(), lostStatus->task_id());
+ EXPECT_EQ(slaveId, lostStatus->slave_id());
+ EXPECT_EQ(partitionTime, lostStatus->unreachable_time());
AWAIT_READY(slaveLost);
@@ -720,9 +720,9 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, ReregisterSlaveNotPartitionAware)
driver.reconcileTasks({status});
AWAIT_READY(reconcileUpdate);
- EXPECT_EQ(TASK_LOST, reconcileUpdate.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate.get().reason());
- EXPECT_FALSE(reconcileUpdate.get().has_unreachable_time());
+ EXPECT_EQ(TASK_LOST, reconcileUpdate->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate->reason());
+ EXPECT_FALSE(reconcileUpdate->has_unreachable_time());
Clock::resume();
@@ -864,7 +864,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
Clock::advance(slaveFlags.registration_backoff_factor);
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- ASSERT_FALSE(offers.get().empty());
+ ASSERT_FALSE(offers->empty());
Offer offer = offers.get()[0];
@@ -886,10 +886,10 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
driver1.launchTasks(offer.id(), {task1});
AWAIT_READY(runningStatus1);
- EXPECT_EQ(TASK_RUNNING, runningStatus1.get().state());
- EXPECT_EQ(task1.task_id(), runningStatus1.get().task_id());
+ EXPECT_EQ(TASK_RUNNING, runningStatus1->state());
+ EXPECT_EQ(task1.task_id(), runningStatus1->task_id());
- const SlaveID& slaveId = runningStatus1.get().slave_id();
+ const SlaveID& slaveId = runningStatus1->slave_id();
AWAIT_READY(statusUpdateAck1);
@@ -910,7 +910,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
driver2.start();
AWAIT_READY(offers);
- ASSERT_FALSE(offers.get().empty());
+ ASSERT_FALSE(offers->empty());
offer = offers.get()[0];
@@ -929,9 +929,9 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
driver2.launchTasks(offer.id(), {task2});
AWAIT_READY(runningStatus2);
- EXPECT_EQ(TASK_RUNNING, runningStatus2.get().state());
- EXPECT_EQ(task2.task_id(), runningStatus2.get().task_id());
- EXPECT_EQ(slaveId, runningStatus2.get().slave_id());
+ EXPECT_EQ(TASK_RUNNING, runningStatus2->state());
+ EXPECT_EQ(task2.task_id(), runningStatus2->task_id());
+ EXPECT_EQ(slaveId, runningStatus2->slave_id());
AWAIT_READY(statusUpdateAck2);
@@ -979,19 +979,19 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
// `sched1` should see TASK_LOST.
AWAIT_READY(lostStatus);
- EXPECT_EQ(TASK_LOST, lostStatus.get().state());
- EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, lostStatus.get().reason());
- EXPECT_EQ(task1.task_id(), lostStatus.get().task_id());
- EXPECT_EQ(slaveId, lostStatus.get().slave_id());
- EXPECT_EQ(partitionTime, lostStatus.get().unreachable_time());
+ EXPECT_EQ(TASK_LOST, lostStatus->state());
+ EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, lostStatus->reason());
+ EXPECT_EQ(task1.task_id(), lostStatus->task_id());
+ EXPECT_EQ(slaveId, lostStatus->slave_id());
+ EXPECT_EQ(partitionTime, lostStatus->unreachable_time());
// `sched2` should see TASK_UNREACHABLE.
AWAIT_READY(unreachableStatus);
- EXPECT_EQ(TASK_UNREACHABLE, unreachableStatus.get().state());
- EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, unreachableStatus.get().reason());
- EXPECT_EQ(task2.task_id(), unreachableStatus.get().task_id());
- EXPECT_EQ(slaveId, unreachableStatus.get().slave_id());
- EXPECT_EQ(partitionTime, unreachableStatus.get().unreachable_time());
+ EXPECT_EQ(TASK_UNREACHABLE, unreachableStatus->state());
+ EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, unreachableStatus->reason());
+ EXPECT_EQ(task2.task_id(), unreachableStatus->task_id());
+ EXPECT_EQ(slaveId, unreachableStatus->slave_id());
+ EXPECT_EQ(partitionTime, unreachableStatus->unreachable_time());
// The master should notify both schedulers that the slave was lost.
AWAIT_READY(slaveLost1);
@@ -1046,8 +1046,8 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
driver1.reconcileTasks({status1});
AWAIT_READY(reconcileUpdate1);
- EXPECT_EQ(TASK_RUNNING, reconcileUpdate1.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate1.get().reason());
+ EXPECT_EQ(TASK_RUNNING, reconcileUpdate1->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate1->reason());
TaskStatus status2;
status2.mutable_task_id()->CopyFrom(task2.task_id());
@@ -1061,8 +1061,8 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
driver2.reconcileTasks({status2});
AWAIT_READY(reconcileUpdate2);
- EXPECT_EQ(TASK_RUNNING, reconcileUpdate2.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate2.get().reason());
+ EXPECT_EQ(TASK_RUNNING, reconcileUpdate2->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate2->reason());
Clock::resume();
@@ -1131,7 +1131,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, PartitionedSlaveOrphanedTask)
Clock::advance(agentFlags.registration_backoff_factor);
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- ASSERT_FALSE(offers.get().empty());
+ ASSERT_FALSE(offers->empty());
Offer offer = offers.get()[0];
@@ -1400,7 +1400,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, DisconnectedFramework)
AWAIT_READY(frameworkId);
AWAIT_READY(offers1);
- ASSERT_FALSE(offers1.get().empty());
+ ASSERT_FALSE(offers1->empty());
Offer offer = offers1.get()[0];
// Launch `task` using `sched1`.
@@ -1416,10 +1416,10 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, DisconnectedFramework)
driver1.launchTasks(offer.id(), {task});
AWAIT_READY(runningStatus);
- EXPECT_EQ(TASK_RUNNING, runningStatus.get().state());
- EXPECT_EQ(task.task_id(), runningStatus.get().task_id());
+ EXPECT_EQ(TASK_RUNNING, runningStatus->state());
+ EXPECT_EQ(task.task_id(), runningStatus->task_id());
- const SlaveID& slaveId = runningStatus.get().slave_id();
+ const SlaveID& slaveId = runningStatus->slave_id();
AWAIT_READY(statusUpdateAck1);
@@ -1504,10 +1504,10 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, DisconnectedFramework)
driver2.reconcileTasks({status});
AWAIT_READY(reconcileUpdate);
- EXPECT_EQ(TASK_LOST, reconcileUpdate.get().state());
+ EXPECT_EQ(TASK_LOST, reconcileUpdate->state());
EXPECT_EQ(TaskStatus::REASON_RECONCILIATION,
- reconcileUpdate.get().reason());
- EXPECT_TRUE(reconcileUpdate.get().has_unreachable_time());
+ reconcileUpdate->reason());
+ EXPECT_TRUE(reconcileUpdate->has_unreachable_time());
Clock::resume();
@@ -1568,7 +1568,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, SpuriousSlaveReregistration)
Clock::advance(agentFlags.registration_backoff_factor);
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- ASSERT_FALSE(offers.get().empty());
+ ASSERT_FALSE(offers->empty());
Offer offer = offers.get()[0];
@@ -1585,10 +1585,10 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, SpuriousSlaveReregistration)
driver.launchTasks(offer.id(), {task});
AWAIT_READY(runningStatus);
- EXPECT_EQ(TASK_RUNNING, runningStatus.get().state());
- EXPECT_EQ(task.task_id(), runningStatus.get().task_id());
+ EXPECT_EQ(TASK_RUNNING, runningStatus->state());
+ EXPECT_EQ(task.task_id(), runningStatus->task_id());
- const SlaveID& slaveId = runningStatus.get().slave_id();
+ const SlaveID& slaveId = runningStatus->slave_id();
AWAIT_READY(statusUpdateAck);
@@ -1619,8 +1619,8 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, SpuriousSlaveReregistration)
driver.reconcileTasks({status});
AWAIT_READY(reconcileUpdate);
- EXPECT_EQ(TASK_RUNNING, reconcileUpdate.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate.get().reason());
+ EXPECT_EQ(TASK_RUNNING, reconcileUpdate->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate->reason());
driver.stop();
driver.join();
@@ -1664,7 +1664,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, PartitionedSlaveStatusUpdates)
Clock::advance(agentFlags.registration_backoff_factor);
AWAIT_READY(slaveRegisteredMessage);
- const SlaveID& slaveId = slaveRegisteredMessage.get().slave_id();
+ const SlaveID& slaveId = slaveRegisteredMessage->slave_id();
MockScheduler sched;
MesosSchedulerDriver driver(
@@ -1830,7 +1830,7 @@ TEST_F(PartitionTest, PartitionedSlaveExitedExecutor)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- ASSERT_NE(0u, offers.get().size());
+ ASSERT_NE(0u, offers->size());
// Launch a task. This allows us to have the slave send an
// ExitedExecutorMessage.
@@ -1874,8 +1874,8 @@ TEST_F(PartitionTest, PartitionedSlaveExitedExecutor)
// The master will notify the framework of the lost task.
AWAIT_READY(lostStatus);
- EXPECT_EQ(TASK_LOST, lostStatus.get().state());
- EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, lostStatus.get().reason());
+ EXPECT_EQ(TASK_LOST, lostStatus->state());
+ EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, lostStatus->reason());
// The master will notify the framework that the slave was lost.
AWAIT_READY(slaveLost);
@@ -2424,7 +2424,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByCount)
Clock::advance(agentFlags1.registration_backoff_factor);
AWAIT_READY(slaveRegisteredMessage1);
- const SlaveID slaveId1 = slaveRegisteredMessage1.get().slave_id();
+ const SlaveID slaveId1 = slaveRegisteredMessage1->slave_id();
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
frameworkInfo.add_capabilities()->set_type(
@@ -2497,7 +2497,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByCount)
Clock::advance(agentFlags2.registration_backoff_factor);
AWAIT_READY(slaveRegisteredMessage2);
- const SlaveID slaveId2 = slaveRegisteredMessage2.get().slave_id();
+ const SlaveID slaveId2 = slaveRegisteredMessage2->slave_id();
Future<Nothing> slaveLost2;
EXPECT_CALL(sched, slaveLost(&driver, _))
@@ -2551,9 +2551,9 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByCount)
driver.reconcileTasks({status1});
AWAIT_READY(reconcileUpdate1);
- EXPECT_EQ(TASK_UNREACHABLE, reconcileUpdate1.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate1.get().reason());
- EXPECT_EQ(partitionTime1, reconcileUpdate1.get().unreachable_time());
+ EXPECT_EQ(TASK_UNREACHABLE, reconcileUpdate1->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate1->reason());
+ EXPECT_EQ(partitionTime1, reconcileUpdate1->unreachable_time());
// Advance the clock to cause GC to be performed.
Clock::advance(masterFlags.registry_gc_interval);
@@ -2574,9 +2574,9 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByCount)
driver.reconcileTasks({status2});
AWAIT_READY(reconcileUpdate2);
- EXPECT_EQ(TASK_UNKNOWN, reconcileUpdate2.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate2.get().reason());
- EXPECT_FALSE(reconcileUpdate2.get().has_unreachable_time());
+ EXPECT_EQ(TASK_UNKNOWN, reconcileUpdate2->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate2->reason());
+ EXPECT_FALSE(reconcileUpdate2->has_unreachable_time());
// Do explicit reconciliation for a random task ID on the second
// partitioned slave. Because the agent is still in the unreachable
@@ -2593,9 +2593,9 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByCount)
driver.reconcileTasks({status3});
AWAIT_READY(reconcileUpdate3);
- EXPECT_EQ(TASK_UNREACHABLE, reconcileUpdate3.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate3.get().reason());
- EXPECT_EQ(partitionTime2, reconcileUpdate3.get().unreachable_time());
+ EXPECT_EQ(TASK_UNREACHABLE, reconcileUpdate3->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate3->reason());
+ EXPECT_EQ(partitionTime2, reconcileUpdate3->unreachable_time());
JSON::Object stats = Metrics();
EXPECT_EQ(2, stats.values["master/slave_unreachable_scheduled"]);
@@ -2702,9 +2702,9 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByCountManySlaves)
driver.reconcileTasks({status1});
AWAIT_READY(reconcileUpdate1);
- EXPECT_EQ(TASK_UNREACHABLE, reconcileUpdate1.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate1.get().reason());
- EXPECT_EQ(unreachableTime, reconcileUpdate1.get().unreachable_time());
+ EXPECT_EQ(TASK_UNREACHABLE, reconcileUpdate1->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate1->reason());
+ EXPECT_EQ(unreachableTime, reconcileUpdate1->unreachable_time());
TaskStatus status2;
status2.mutable_task_id()->set_value(UUID::random().toString());
@@ -2718,9 +2718,9 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByCountManySlaves)
driver.reconcileTasks({status2});
AWAIT_READY(reconcileUpdate2);
- EXPECT_EQ(TASK_UNKNOWN, reconcileUpdate2.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate2.get().reason());
- EXPECT_FALSE(reconcileUpdate2.get().has_unreachable_time());
+ EXPECT_EQ(TASK_UNKNOWN, reconcileUpdate2->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate2->reason());
+ EXPECT_FALSE(reconcileUpdate2->has_unreachable_time());
driver.stop();
driver.join();
@@ -2780,7 +2780,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByAge)
// Advance clock to trigger agent registration.
Clock::advance(agentFlags1.registration_backoff_factor);
AWAIT_READY(slaveRegisteredMessage1);
- const SlaveID slaveId1 = slaveRegisteredMessage1.get().slave_id();
+ const SlaveID slaveId1 = slaveRegisteredMessage1->slave_id();
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
frameworkInfo.add_capabilities()->set_type(
@@ -2860,7 +2860,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByAge)
// Advance clock to trigger agent registration.
Clock::advance(agentFlags2.registration_backoff_factor);
AWAIT_READY(slaveRegisteredMessage2);
- const SlaveID slaveId2 = slaveRegisteredMessage2.get().slave_id();
+ const SlaveID slaveId2 = slaveRegisteredMessage2->slave_id();
Future<Nothing> slaveLost2;
EXPECT_CALL(sched, slaveLost(&driver, _))
@@ -2915,9 +2915,9 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByAge)
driver.reconcileTasks({status1});
AWAIT_READY(reconcileUpdate1);
- EXPECT_EQ(TASK_UNREACHABLE, reconcileUpdate1.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate1.get().reason());
- EXPECT_EQ(partitionTime1, reconcileUpdate1.get().unreachable_time());
+ EXPECT_EQ(TASK_UNREACHABLE, reconcileUpdate1->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate1->reason());
+ EXPECT_EQ(partitionTime1, reconcileUpdate1->unreachable_time());
TaskStatus status2;
status2.mutable_task_id()->set_value(UUID::random().toString());
@@ -2931,9 +2931,9 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByAge)
driver.reconcileTasks({status2});
AWAIT_READY(reconcileUpdate2);
- EXPECT_EQ(TASK_UNREACHABLE, reconcileUpdate2.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate2.get().reason());
- EXPECT_EQ(partitionTime2, reconcileUpdate2.get().unreachable_time());
+ EXPECT_EQ(TASK_UNREACHABLE, reconcileUpdate2->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate2->reason());
+ EXPECT_EQ(partitionTime2, reconcileUpdate2->unreachable_time());
// Advance the clock to cause GC to be performed.
Clock::advance(Minutes(15));
@@ -2954,9 +2954,9 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByAge)
driver.reconcileTasks({status3});
AWAIT_READY(reconcileUpdate3);
- EXPECT_EQ(TASK_UNKNOWN, reconcileUpdate3.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate3.get().reason());
- EXPECT_FALSE(reconcileUpdate3.get().has_unreachable_time());
+ EXPECT_EQ(TASK_UNKNOWN, reconcileUpdate3->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate3->reason());
+ EXPECT_FALSE(reconcileUpdate3->has_unreachable_time());
TaskStatus status4;
status4.mutable_task_id()->set_value(UUID::random().toString());
@@ -2970,9 +2970,9 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByAge)
driver.reconcileTasks({status4});
AWAIT_READY(reconcileUpdate4);
- EXPECT_EQ(TASK_UNREACHABLE, reconcileUpdate4.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate4.get().reason());
- EXPECT_EQ(partitionTime2, reconcileUpdate4.get().unreachable_time());
+ EXPECT_EQ(TASK_UNREACHABLE, reconcileUpdate4->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate4->reason());
+ EXPECT_EQ(partitionTime2, reconcileUpdate4->unreachable_time());
// Advance the clock to cause GC to be performed.
Clock::advance(Minutes(15));
@@ -2993,9 +2993,9 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByAge)
driver.reconcileTasks({status5});
AWAIT_READY(reconcileUpdate5);
- EXPECT_EQ(TASK_UNKNOWN, reconcileUpdate5.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate5.get().reason());
- EXPECT_FALSE(reconcileUpdate5.get().has_unreachable_time());
+ EXPECT_EQ(TASK_UNKNOWN, reconcileUpdate5->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate5->reason());
+ EXPECT_FALSE(reconcileUpdate5->has_unreachable_time());
driver.stop();
driver.join();
@@ -3041,7 +3041,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcRace)
// Wait for the slave to register and get the slave id.
Clock::advance(agentFlags1.registration_backoff_factor);
AWAIT_READY(slaveRegisteredMessage1);
- SlaveID slaveId1 = slaveRegisteredMessage1.get().slave_id();
+ SlaveID slaveId1 = slaveRegisteredMessage1->slave_id();
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
frameworkInfo.add_capabilities()->set_type(
@@ -3100,7 +3100,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcRace)
// Wait for the slave to register and get the slave id.
Clock::advance(agentFlags2.registration_backoff_factor);
AWAIT_READY(slaveRegisteredMessage2);
- SlaveID slaveId2 = slaveRegisteredMessage2.get().slave_id();
+ SlaveID slaveId2 = slaveRegisteredMessage2->slave_id();
// Induce a partition of the slave.
size_t pings2 = 0;
@@ -3141,7 +3141,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcRace)
// Wait for the slave to register and get the slave id.
Clock::advance(agentFlags3.registration_backoff_factor);
AWAIT_READY(slaveRegisteredMessage3);
- SlaveID slaveId3 = slaveRegisteredMessage3.get().slave_id();
+ SlaveID slaveId3 = slaveRegisteredMessage3->slave_id();
// Induce a partition of the slave.
size_t pings3 = 0;
@@ -3186,7 +3186,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcRace)
EXPECT_NE(
nullptr,
dynamic_cast<master::MarkSlaveReachable*>(
- markReachable.get().get()));
+ markReachable->get()));
// Trigger GC. Because GC has been configured to preserve a single
// unreachable slave (the slave marked unreachable most recently),
@@ -3205,7 +3205,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcRace)
EXPECT_NE(
nullptr,
dynamic_cast<master::PruneUnreachable*>(
- pruneUnreachable.get().get()));
+ pruneUnreachable->get()));
// Apply the registry operation to mark the slave reachable, then
// pass the result back to the master to allow it to continue. We
@@ -3247,9 +3247,9 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcRace)
driver.reconcileTasks({status1});
AWAIT_READY(reconcileUpdate1);
- EXPECT_EQ(TASK_UNKNOWN, reconcileUpdate1.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate1.get().reason());
- EXPECT_FALSE(reconcileUpdate1.get().has_unreachable_time());
+ EXPECT_EQ(TASK_UNKNOWN, reconcileUpdate1->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate1->reason());
+ EXPECT_FALSE(reconcileUpdate1->has_unreachable_time());
TaskStatus status2;
status2.mutable_task_id()->set_value(UUID::random().toString());
@@ -3263,9 +3263,9 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcRace)
driver.reconcileTasks({status2});
AWAIT_READY(reconcileUpdate2);
- EXPECT_EQ(TASK_UNKNOWN, reconcileUpdate2.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate2.get().reason());
- EXPECT_FALSE(reconcileUpdate2.get().has_unreachable_time());
+ EXPECT_EQ(TASK_UNKNOWN, reconcileUpdate2->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate2->reason());
+ EXPECT_FALSE(reconcileUpdate2->has_unreachable_time());
TaskStatus status3;
status3.mutable_task_id()->set_value(UUID::random().toString());
@@ -3279,9 +3279,9 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcRace)
driver.reconcileTasks({status3});
AWAIT_READY(reconcileUpdate3);
- EXPECT_EQ(TASK_UNREACHABLE, reconcileUpdate3.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate3.get().reason());
- EXPECT_TRUE(reconcileUpdate3.get().has_unreachable_time());
+ EXPECT_EQ(TASK_UNREACHABLE, reconcileUpdate3->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate3->reason());
+ EXPECT_TRUE(reconcileUpdate3->has_unreachable_time());
driver.stop();
driver.join();
@@ -3369,7 +3369,7 @@ TEST_F(PartitionTest, FailHealthChecksTwice)
EXPECT_NE(
nullptr,
dynamic_cast<master::MarkSlaveUnreachable*>(
- markUnreachable.get().get()));
+ markUnreachable->get()));
// Cause the slave to fail another health check. This is possible
// because we don't shutdown the SlaveObserver until we have marked
@@ -3504,7 +3504,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(OneWayPartitionTest, MasterToScheduler)
// Simulate framework disconnection. This should result in an error message.
ASSERT_TRUE(process::inject::exited(
- frameworkRegisteredMessage.get().to, master.get()->pid));
+ frameworkRegisteredMessage->to, master.get()->pid));
AWAIT_READY(error);
http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/persistent_volume_endpoints_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/persistent_volume_endpoints_tests.cpp b/src/tests/persistent_volume_endpoints_tests.cpp
index 741d62e..d5fcdbf 100644
--- a/src/tests/persistent_volume_endpoints_tests.cpp
+++ b/src/tests/persistent_volume_endpoints_tests.cpp
@@ -167,7 +167,7 @@ TEST_F(PersistentVolumeEndpointsTest, StaticReservation)
AWAIT_READY(offers);
- ASSERT_EQ(1u, offers.get().size());
+ ASSERT_EQ(1u, offers->size());
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -195,7 +195,7 @@ TEST_F(PersistentVolumeEndpointsTest, StaticReservation)
AWAIT_READY(offers);
- ASSERT_EQ(1u, offers.get().size());
+ ASSERT_EQ(1u, offers->size());
offer = offers.get()[0];
EXPECT_FALSE(Resources(offer.resources()).contains(
@@ -262,7 +262,7 @@ TEST_F(PersistentVolumeEndpointsTest, DynamicReservation)
AWAIT_READY(offers);
- ASSERT_EQ(1u, offers.get().size());
+ ASSERT_EQ(1u, offers->size());
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -299,7 +299,7 @@ TEST_F(PersistentVolumeEndpointsTest, DynamicReservation)
AWAIT_READY(offers);
- ASSERT_EQ(1u, offers.get().size());
+ ASSERT_EQ(1u, offers->size());
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -381,7 +381,7 @@ TEST_F(PersistentVolumeEndpointsTest, DynamicReservationRoleMismatch)
AWAIT_READY(offers);
- ASSERT_EQ(1u, offers.get().size());
+ ASSERT_EQ(1u, offers->size());
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -899,7 +899,7 @@ TEST_F(PersistentVolumeEndpointsTest, GoodCreateAndDestroyACL)
AWAIT_READY(offers);
- ASSERT_EQ(1u, offers.get().size());
+ ASSERT_EQ(1u, offers->size());
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -930,7 +930,7 @@ TEST_F(PersistentVolumeEndpointsTest, GoodCreateAndDestroyACL)
AWAIT_READY(offers);
- ASSERT_EQ(1u, offers.get().size());
+ ASSERT_EQ(1u, offers->size());
offer = offers.get()[0];
EXPECT_FALSE(Resources(offer.resources()).contains(
@@ -1129,7 +1129,7 @@ TEST_F(PersistentVolumeEndpointsTest, BadCreateAndDestroyACL)
AWAIT_READY(offers);
- ASSERT_EQ(1u, offers.get().size());
+ ASSERT_EQ(1u, offers->size());
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -1337,7 +1337,7 @@ TEST_F(PersistentVolumeEndpointsTest, GoodCreateAndDestroyACLBadCredential)
AWAIT_READY(offers);
- ASSERT_EQ(1u, offers.get().size());
+ ASSERT_EQ(1u, offers->size());
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -1510,7 +1510,7 @@ TEST_F(PersistentVolumeEndpointsTest, NoVolumes)
ASSERT_SOME(slave);
process::http::Headers headers = createBasicAuthHeaders(DEFAULT_CREDENTIAL);
- string body = "slaveId=" + slaveId.get().value();
+ string body = "slaveId=" + slaveId->value();
Future<Response> response =
process::http::post(master.get()->pid, "create-volumes", headers, body);
@@ -1591,7 +1591,7 @@ TEST_F(PersistentVolumeEndpointsTest, OfferCreateThenEndpointRemove)
AWAIT_READY(offers);
- ASSERT_EQ(1u, offers.get().size());
+ ASSERT_EQ(1u, offers->size());
Offer offer = offers.get()[0];
EXPECT_EQ(offer.slave_id(), slaveId.get());
@@ -1610,7 +1610,7 @@ TEST_F(PersistentVolumeEndpointsTest, OfferCreateThenEndpointRemove)
// Expect an offer with reserved resources.
AWAIT_READY(offers);
- ASSERT_EQ(1u, offers.get().size());
+ ASSERT_EQ(1u, offers->size());
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -1635,7 +1635,7 @@ TEST_F(PersistentVolumeEndpointsTest, OfferCreateThenEndpointRemove)
// Expect an offer with a persistent volume.
AWAIT_READY(offers);
- ASSERT_EQ(1u, offers.get().size());
+ ASSERT_EQ(1u, offers->size());
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -1664,7 +1664,7 @@ TEST_F(PersistentVolumeEndpointsTest, OfferCreateThenEndpointRemove)
// Expect an offer containing reserved resources.
AWAIT_READY(offers);
- ASSERT_EQ(1u, offers.get().size());
+ ASSERT_EQ(1u, offers->size());
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -1691,7 +1691,7 @@ TEST_F(PersistentVolumeEndpointsTest, OfferCreateThenEndpointRemove)
// Expect an offer containing only unreserved resources.
AWAIT_READY(offers);
- ASSERT_EQ(1u, offers.get().size());
+ ASSERT_EQ(1u, offers->size());
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -1776,7 +1776,7 @@ TEST_F(PersistentVolumeEndpointsTest, EndpointCreateThenOfferRemove)
// Expect an offer containing the persistent volume.
AWAIT_READY(offers);
- ASSERT_EQ(1u, offers.get().size());
+ ASSERT_EQ(1u, offers->size());
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -1798,7 +1798,7 @@ TEST_F(PersistentVolumeEndpointsTest, EndpointCreateThenOfferRemove)
// Expect an offer containing the dynamic reservation.
AWAIT_READY(offers);
- ASSERT_EQ(1u, offers.get().size());
+ ASSERT_EQ(1u, offers->size());
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -1813,7 +1813,7 @@ TEST_F(PersistentVolumeEndpointsTest, EndpointCreateThenOfferRemove)
// Expect an offer containing only unreserved resources.
AWAIT_READY(offers);
- ASSERT_EQ(1u, offers.get().size());
+ ASSERT_EQ(1u, offers->size());
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -1897,7 +1897,7 @@ TEST_F(PersistentVolumeEndpointsTest, ReserveAndSlaveRemoval)
AWAIT_READY(offers);
- ASSERT_EQ(2u, offers.get().size());
+ ASSERT_EQ(2u, offers->size());
Future<CheckpointResourcesMessage> checkpointResources =
FUTURE_PROTOBUF(CheckpointResourcesMessage(),
@@ -1910,7 +1910,7 @@ TEST_F(PersistentVolumeEndpointsTest, ReserveAndSlaveRemoval)
frameworkInfo.role(),
createReservationInfo(DEFAULT_CREDENTIAL.principal())).get();
- for (size_t i = 0; i < offers.get().size(); i++) {
+ for (size_t i = 0; i < offers->size(); i++) {
const Offer& offer = offers.get()[i];
const SlaveID& offeredSlaveId = offer.slave_id();
@@ -1924,7 +1924,7 @@ TEST_F(PersistentVolumeEndpointsTest, ReserveAndSlaveRemoval)
}
AWAIT_READY(checkpointResources);
- EXPECT_EQ(Resources(checkpointResources.get().resources()),
+ EXPECT_EQ(Resources(checkpointResources->resources()),
slave2Reserved);
// Shutdown `slave2` with an explicit shutdown message.
@@ -2032,7 +2032,7 @@ TEST_F(PersistentVolumeEndpointsTest, SlavesEndpointFullResources)
AWAIT_READY(offers);
- ASSERT_EQ(1u, offers.get().size());
+ ASSERT_EQ(1u, offers->size());
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -2074,7 +2074,7 @@ TEST_F(PersistentVolumeEndpointsTest, SlavesEndpointFullResources)
AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response);
- Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
+ Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
ASSERT_SOME(parse);
http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/persistent_volume_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/persistent_volume_tests.cpp b/src/tests/persistent_volume_tests.cpp
index 7ac8286..3eb7afe 100644
--- a/src/tests/persistent_volume_tests.cpp
+++ b/src/tests/persistent_volume_tests.cpp
@@ -287,7 +287,7 @@ TEST_P(PersistentVolumeTest, CreateAndDestroyPersistentVolumes)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
@@ -352,12 +352,12 @@ TEST_P(PersistentVolumeTest, CreateAndDestroyPersistentVolumes)
// NOTE: Currently, we send one message per operation. But this is
// an implementation detail which is subject to change.
AWAIT_READY(message1);
- EXPECT_EQ(Resources(message1.get().resources()), volume1);
+ EXPECT_EQ(Resources(message1->resources()), volume1);
// Await the `CheckpointResourcesMessage` and ensure that it contains
// both volume1 and volume2.
AWAIT_READY(message2);
- EXPECT_EQ(Resources(message2.get().resources()),
+ EXPECT_EQ(Resources(message2->resources()),
Resources(volume1) + Resources(volume2));
// Ensure that the `CheckpointResourcesMessage`s reach the slave.
@@ -369,7 +369,7 @@ TEST_P(PersistentVolumeTest, CreateAndDestroyPersistentVolumes)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
offer = offers.get()[0];
@@ -388,7 +388,7 @@ TEST_P(PersistentVolumeTest, CreateAndDestroyPersistentVolumes)
// Await the `CheckpointResourcesMessage` and ensure that it contains
// volume2 but not volume1.
AWAIT_READY(message3);
- EXPECT_EQ(Resources(message3.get().resources()), volume2);
+ EXPECT_EQ(Resources(message3->resources()), volume2);
// Ensure that the `CheckpointResourcesMessage`s reach the slave.
Clock::settle();
@@ -402,7 +402,7 @@ TEST_P(PersistentVolumeTest, CreateAndDestroyPersistentVolumes)
Try<list<string>> files = ::fs::list(path::join(volume1Path, "*"));
ASSERT_SOME(files);
- EXPECT_EQ(0u, files.get().size());
+ EXPECT_EQ(0u, files->size());
} else {
EXPECT_FALSE(os::exists(volume1Path));
}
@@ -448,7 +448,7 @@ TEST_P(PersistentVolumeTest, ResourcesCheckpointing)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
@@ -478,7 +478,7 @@ TEST_P(PersistentVolumeTest, ResourcesCheckpointing)
ASSERT_SOME(slave);
AWAIT_READY(reregisterSlave);
- EXPECT_EQ(Resources(reregisterSlave.get().checkpointed_resources()), volume);
+ EXPECT_EQ(Resources(reregisterSlave->checkpointed_resources()), volume);
driver.stop();
driver.join();
@@ -514,7 +514,7 @@ TEST_P(PersistentVolumeTest, PreparePersistentVolume)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
@@ -582,7 +582,7 @@ TEST_P(PersistentVolumeTest, MasterFailover)
driver.start();
AWAIT_READY(offers1);
- EXPECT_FALSE(offers1.get().empty());
+ EXPECT_FALSE(offers1->empty());
Offer offer1 = offers1.get()[0];
@@ -638,7 +638,7 @@ TEST_P(PersistentVolumeTest, MasterFailover)
AWAIT_READY(slaveReregistered);
AWAIT_READY(offers2);
- EXPECT_FALSE(offers2.get().empty());
+ EXPECT_FALSE(offers2->empty());
Offer offer2 = offers2.get()[0];
@@ -685,7 +685,7 @@ TEST_P(PersistentVolumeTest, IncompatibleCheckpointedResources)
driver.start();
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
@@ -781,7 +781,7 @@ TEST_P(PersistentVolumeTest, AccessPersistentVolume)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
@@ -818,12 +818,12 @@ TEST_P(PersistentVolumeTest, AccessPersistentVolume)
LAUNCH({task})});
AWAIT_READY(status1);
- EXPECT_EQ(task.task_id(), status1.get().task_id());
- EXPECT_EQ(TASK_RUNNING, status1.get().state());
+ EXPECT_EQ(task.task_id(), status1->task_id());
+ EXPECT_EQ(TASK_RUNNING, status1->state());
AWAIT_READY(status2);
- EXPECT_EQ(task.task_id(), status2.get().task_id());
- EXPECT_EQ(TASK_FINISHED, status2.get().state());
+ EXPECT_EQ(task.task_id(), status2->task_id());
+ EXPECT_EQ(TASK_FINISHED, status2->state());
// This is to verify that the persistent volume is correctly
// unlinked from the executor working directory after TASK_FINISHED
@@ -878,7 +878,7 @@ TEST_P(PersistentVolumeTest, AccessPersistentVolume)
AWAIT_READY(checkpointMessage);
- Resources checkpointResources = checkpointMessage.get().resources();
+ Resources checkpointResources = checkpointMessage->resources();
EXPECT_FALSE(checkpointResources.contains(volume));
// Ensure that `checkpointMessage` reaches the slave.
@@ -895,7 +895,7 @@ TEST_P(PersistentVolumeTest, AccessPersistentVolume)
Try<list<string>> files = ::fs::list(path::join(volumePath, "*"));
CHECK_SOME(files);
- EXPECT_EQ(0u, files.get().size());
+ EXPECT_EQ(0u, files->size());
} else {
EXPECT_FALSE(os::exists(volumePath));
}
@@ -945,7 +945,7 @@ TEST_P(PersistentVolumeTest, SharedPersistentVolumeMultipleTasks)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
@@ -1058,7 +1058,7 @@ TEST_P(PersistentVolumeTest, SharedPersistentVolumeRescindOnDestroy)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers1);
- EXPECT_FALSE(offers1.get().empty());
+ EXPECT_FALSE(offers1->empty());
Offer offer1 = offers1.get()[0];
@@ -1206,7 +1206,7 @@ TEST_P(PersistentVolumeTest, SharedPersistentVolumeMasterFailover)
driver.start();
AWAIT_READY(offers1);
- EXPECT_FALSE(offers1.get().empty());
+ EXPECT_FALSE(offers1->empty());
Offer offer1 = offers1.get()[0];
@@ -1248,10 +1248,10 @@ TEST_P(PersistentVolumeTest, SharedPersistentVolumeMasterFailover)
AWAIT_READY(checkpointResources);
AWAIT_READY(status1);
- EXPECT_EQ(TASK_RUNNING, status1.get().state());
+ EXPECT_EQ(TASK_RUNNING, status1->state());
AWAIT_READY(status2);
- EXPECT_EQ(TASK_RUNNING, status2.get().state());
+ EXPECT_EQ(TASK_RUNNING, status2->state());
// This is to make sure CheckpointResourcesMessage is processed.
Clock::pause();
@@ -1283,7 +1283,7 @@ TEST_P(PersistentVolumeTest, SharedPersistentVolumeMasterFailover)
AWAIT_READY(slaveReregistered);
AWAIT_READY(offers2);
- EXPECT_FALSE(offers2.get().empty());
+ EXPECT_FALSE(offers2->empty());
Offer offer2 = offers2.get()[0];
@@ -1351,7 +1351,7 @@ TEST_P(PersistentVolumeTest, DestroyPersistentVolumeMultipleTasks)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
@@ -1423,10 +1423,10 @@ TEST_P(PersistentVolumeTest, DestroyPersistentVolumeMultipleTasks)
vector<Future<TaskStatus>> statuses{status1, status2, status3};
foreach (const Future<TaskStatus>& status, statuses) {
- if (status.get().state() == TASK_RUNNING) {
- tasksRunning.insert(status.get().task_id());
+ if (status->state() == TASK_RUNNING) {
+ tasksRunning.insert(status->task_id());
} else {
- tasksFinished.insert(status.get().task_id());
+ tasksFinished.insert(status->task_id());
}
}
@@ -1440,7 +1440,7 @@ TEST_P(PersistentVolumeTest, DestroyPersistentVolumeMultipleTasks)
// Await the offer containing the persistent volume.
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
offer = offers.get()[0];
@@ -1471,7 +1471,7 @@ TEST_P(PersistentVolumeTest, DestroyPersistentVolumeMultipleTasks)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
offer = offers.get()[0];
@@ -1489,8 +1489,8 @@ TEST_P(PersistentVolumeTest, DestroyPersistentVolumeMultipleTasks)
driver.killTask(task1.task_id());
AWAIT_READY(status4);
- EXPECT_EQ(task1.task_id(), status4.get().task_id());
- EXPECT_EQ(TASK_KILLED, status4.get().state());
+ EXPECT_EQ(task1.task_id(), status4->task_id());
+ EXPECT_EQ(TASK_KILLED, status4->state());
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers));
@@ -1506,7 +1506,7 @@ TEST_P(PersistentVolumeTest, DestroyPersistentVolumeMultipleTasks)
Clock::resume();
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
offer = offers.get()[0];
@@ -1561,7 +1561,7 @@ TEST_P(PersistentVolumeTest, SharedPersistentVolumeMultipleIterations)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
@@ -1699,7 +1699,7 @@ TEST_P(PersistentVolumeTest, SlaveRecovery)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
@@ -1733,8 +1733,8 @@ TEST_P(PersistentVolumeTest, SlaveRecovery)
{CREATE(volume), LAUNCH({task})});
AWAIT_READY(status1);
- EXPECT_EQ(task.task_id(), status1.get().task_id());
- EXPECT_EQ(TASK_RUNNING, status1.get().state());
+ EXPECT_EQ(task.task_id(), status1->task_id());
+ EXPECT_EQ(TASK_RUNNING, status1->state());
// Wait for the ACK to be checkpointed.
AWAIT_READY(ack);
@@ -1775,8 +1775,8 @@ TEST_P(PersistentVolumeTest, SlaveRecovery)
driver.killTask(task.task_id());
AWAIT_READY(status2);
- EXPECT_EQ(task.task_id(), status2.get().task_id());
- EXPECT_EQ(TASK_KILLED, status2.get().state());
+ EXPECT_EQ(task.task_id(), status2->task_id());
+ EXPECT_EQ(TASK_KILLED, status2->state());
driver.stop();
driver.join();
@@ -1850,7 +1850,7 @@ TEST_P(PersistentVolumeTest, GoodACLCreateThenDestroy)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
@@ -1873,7 +1873,7 @@ TEST_P(PersistentVolumeTest, GoodACLCreateThenDestroy)
// Await the CheckpointResourceMessage response after the volume is created
// and check that it contains the volume.
AWAIT_READY(checkpointResources1);
- EXPECT_EQ(Resources(checkpointResources1.get().resources()), volume);
+ EXPECT_EQ(Resources(checkpointResources1->resources()), volume);
// Expect an offer containing the persistent volume.
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -1884,7 +1884,7 @@ TEST_P(PersistentVolumeTest, GoodACLCreateThenDestroy)
// Await the offer containing the persistent volume.
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
offer = offers.get()[0];
@@ -1906,7 +1906,7 @@ TEST_P(PersistentVolumeTest, GoodACLCreateThenDestroy)
AWAIT_READY(checkpointResources2);
EXPECT_FALSE(
- Resources(checkpointResources2.get().resources()).contains(volume));
+ Resources(checkpointResources2->resources()).contains(volume));
// Expect an offer that does not contain the persistent volume.
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -1916,7 +1916,7 @@ TEST_P(PersistentVolumeTest, GoodACLCreateThenDestroy)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
offer = offers.get()[0];
@@ -2000,7 +2000,7 @@ TEST_P(PersistentVolumeTest, GoodACLNoPrincipal)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
@@ -2023,7 +2023,7 @@ TEST_P(PersistentVolumeTest, GoodACLNoPrincipal)
// Await the CheckpointResourceMessage response after the volume is created
// and check that it contains the volume.
AWAIT_READY(checkpointResources1);
- EXPECT_EQ(Resources(checkpointResources1.get().resources()), volume);
+ EXPECT_EQ(Resources(checkpointResources1->resources()), volume);
// Expect an offer containing the persistent volume.
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -2034,7 +2034,7 @@ TEST_P(PersistentVolumeTest, GoodACLNoPrincipal)
// Await the offer containing the persistent volume.
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
offer = offers.get()[0];
@@ -2064,7 +2064,7 @@ TEST_P(PersistentVolumeTest, GoodACLNoPrincipal)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
offer = offers.get()[0];
@@ -2072,7 +2072,7 @@ TEST_P(PersistentVolumeTest, GoodACLNoPrincipal)
EXPECT_FALSE(Resources(offer.resources()).contains(
allocatedResources(volume, frameworkInfo.role())));
EXPECT_FALSE(
- Resources(checkpointResources2.get().resources()).contains(volume));
+ Resources(checkpointResources2->resources()).contains(volume));
driver.stop();
driver.join();
@@ -2158,7 +2158,7 @@ TEST_P(PersistentVolumeTest, BadACLNoPrincipal)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
@@ -2184,7 +2184,7 @@ TEST_P(PersistentVolumeTest, BadACLNoPrincipal)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
offer = offers.get()[0];
@@ -2215,7 +2215,7 @@ TEST_P(PersistentVolumeTest, BadACLNoPrincipal)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
offer = offers.get()[0];
@@ -2240,7 +2240,7 @@ TEST_P(PersistentVolumeTest, BadACLNoPrincipal)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
offer = offers.get()[0];
@@ -2265,7 +2265,7 @@ TEST_P(PersistentVolumeTest, BadACLNoPrincipal)
driver1.reviveOffers();
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
offer = offers.get()[0];
@@ -2283,7 +2283,7 @@ TEST_P(PersistentVolumeTest, BadACLNoPrincipal)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
offer = offers.get()[0];
@@ -2380,7 +2380,7 @@ TEST_P(PersistentVolumeTest, BadACLDropCreateAndDestroy)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
Offer offer = offers.get()[0];
@@ -2406,7 +2406,7 @@ TEST_P(PersistentVolumeTest, BadACLDropCreateAndDestroy)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
offer = offers.get()[0];
@@ -2437,7 +2437,7 @@ TEST_P(PersistentVolumeTest, BadACLDropCreateAndDestroy)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
offer = offers.get()[0];
@@ -2462,7 +2462,7 @@ TEST_P(PersistentVolumeTest, BadACLDropCreateAndDestroy)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
offer = offers.get()[0];
@@ -2487,7 +2487,7 @@ TEST_P(PersistentVolumeTest, BadACLDropCreateAndDestroy)
driver1.reviveOffers();
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
offer = offers.get()[0];
@@ -2505,7 +2505,7 @@ TEST_P(PersistentVolumeTest, BadACLDropCreateAndDestroy)
Clock::advance(masterFlags.allocation_interval);
AWAIT_READY(offers);
- EXPECT_FALSE(offers.get().empty());
+ EXPECT_FALSE(offers->empty());
offer = offers.get()[0];
http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/protobuf_io_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/protobuf_io_tests.cpp b/src/tests/protobuf_io_tests.cpp
index 82bffb8..a7f9dbe 100644
--- a/src/tests/protobuf_io_tests.cpp
+++ b/src/tests/protobuf_io_tests.cpp
@@ -81,7 +81,7 @@ TEST_F(ProtobufIOTest, Basic)
break;
}
- EXPECT_EQ(read.get().value(), stringify(reads++));
+ EXPECT_EQ(read->value(), stringify(reads++));
}
// Ensure we've hit the end of the file without reading a partial
@@ -122,7 +122,7 @@ TEST_F(ProtobufIOTest, Append)
break;
}
- EXPECT_EQ(read.get().value(), stringify(reads++));
+ EXPECT_EQ(read->value(), stringify(reads++));
}
// Ensure we've hit the end of the file without reading a partial
http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/rate_limiting_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/rate_limiting_tests.cpp b/src/tests/rate_limiting_tests.cpp
index 646848e..802d5ca 100644
--- a/src/tests/rate_limiting_tests.cpp
+++ b/src/tests/rate_limiting_tests.cpp
@@ -138,7 +138,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RateLimitingTest, NoRateLimiting)
AWAIT_READY(subscribeCall);
AWAIT_READY(frameworkRegisteredMessage);
- const process::UPID schedulerPid = frameworkRegisteredMessage.get().to;
+ const process::UPID schedulerPid = frameworkRegisteredMessage->to;
// Send a duplicate subscribe call. Master sends
// FrameworkRegisteredMessage back after processing it.
@@ -231,7 +231,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RateLimitingTest, RateLimitingEnabled)
AWAIT_READY(subscribeCall);
AWAIT_READY(frameworkRegisteredMessage);
- const process::UPID schedulerPid = frameworkRegisteredMessage.get().to;
+ const process::UPID schedulerPid = frameworkRegisteredMessage->to;
// Keep sending duplicate subscribe call. Master sends
// FrameworkRegisteredMessage back after processing each of them.
@@ -376,7 +376,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RateLimitingTest, DifferentPrincipalFrameworks)
AWAIT_READY(subscribeCall1);
AWAIT_READY(frameworkRegisteredMessage1);
- const process::UPID sched1Pid = frameworkRegisteredMessage1.get().to;
+ const process::UPID sched1Pid = frameworkRegisteredMessage1->to;
// 1.2. Create the second framework.
FrameworkInfo frameworkInfo2 = DEFAULT_FRAMEWORK_INFO;
@@ -399,7 +399,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RateLimitingTest, DifferentPrincipalFrameworks)
AWAIT_READY(subscribeCall2);
AWAIT_READY(frameworkRegisteredMessage2);
- const process::UPID sched2Pid = frameworkRegisteredMessage2.get().to;
+ const process::UPID sched2Pid = frameworkRegisteredMessage2->to;
// 2. Send duplicate subscribe call from the two schedulers to
// Master.
@@ -601,7 +601,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RateLimitingTest, SamePrincipalFrameworks)
AWAIT_READY(subscribeCall1);
AWAIT_READY(frameworkRegisteredMessage1);
- const process::UPID sched1Pid = frameworkRegisteredMessage1.get().to;
+ const process::UPID sched1Pid = frameworkRegisteredMessage1->to;
// 1.2. Create the second framework.
@@ -624,7 +624,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RateLimitingTest, SamePrincipalFrameworks)
AWAIT_READY(subscribeCall2);
AWAIT_READY(frameworkRegisteredMessage2);
- const process::UPID sched2Pid = frameworkRegisteredMessage2.get().to;
+ const process::UPID sched2Pid = frameworkRegisteredMessage2->to;
// Message counters added after both frameworks are registered.
{
@@ -758,7 +758,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RateLimitingTest, SchedulerFailover)
AWAIT_READY(frameworkRegisteredMessage);
AWAIT_READY(frameworkId);
- const process::UPID schedulerPid = frameworkRegisteredMessage.get().to;
+ const process::UPID schedulerPid = frameworkRegisteredMessage->to;
// Send a duplicate subscribe call. Master replies with a
// duplicate FrameworkRegisteredMessage.
@@ -828,7 +828,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RateLimitingTest, SchedulerFailover)
AWAIT_READY(sched1Error);
AWAIT_READY(frameworkRegisteredMessage);
- const process::UPID schedulerPid = frameworkRegisteredMessage.get().to;
+ const process::UPID schedulerPid = frameworkRegisteredMessage->to;
Future<process::Message> duplicateFrameworkRegisteredMessage =
FUTURE_MESSAGE(Eq(FrameworkRegisteredMessage().GetTypeName()),
@@ -941,7 +941,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RateLimitingTest, CapacityReached)
AWAIT_READY(subscribeCall);
AWAIT_READY(frameworkRegisteredMessage);
- const process::UPID schedulerPid = frameworkRegisteredMessage.get().to;
+ const process::UPID schedulerPid = frameworkRegisteredMessage->to;
// Keep sending duplicate subscribe calls. Master sends
// FrameworkRegisteredMessage back after processing each of them.
http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/reconciliation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/reconciliation_tests.cpp b/src/tests/reconciliation_tests.cpp
index b84a1ab..fb91756 100644
--- a/src/tests/reconciliation_tests.cpp
+++ b/src/tests/reconciliation_tests.cpp
@@ -117,12 +117,12 @@ TEST_F(ReconciliationTest, TaskStateMismatch)
AWAIT_READY(frameworkId);
AWAIT_READY(update);
- EXPECT_EQ(TASK_RUNNING, update.get().state());
+ EXPECT_EQ(TASK_RUNNING, update->state());
- EXPECT_TRUE(update.get().has_slave_id());
+ EXPECT_TRUE(update->has_slave_id());
- const TaskID taskId = update.get().task_id();
- const SlaveID slaveId = update.get().slave_id();
+ const TaskID taskId = update->task_id();
+ const SlaveID slaveId = update->slave_id();
// If framework has different state, current state should be reported.
Future<TaskStatus> update2;
@@ -137,8 +137,8 @@ TEST_F(ReconciliationTest, TaskStateMismatch)
driver.reconcileTasks({status});
AWAIT_READY(update2);
- EXPECT_EQ(TASK_RUNNING, update2.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update2.get().reason());
+ EXPECT_EQ(TASK_RUNNING, update2->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update2->reason());
EXPECT_CALL(exec, shutdown(_))
.Times(AtMost(1));
@@ -193,11 +193,11 @@ TEST_F(ReconciliationTest, TaskStateMatch)
AWAIT_READY(frameworkId);
AWAIT_READY(update);
- EXPECT_EQ(TASK_RUNNING, update.get().state());
- EXPECT_TRUE(update.get().has_slave_id());
+ EXPECT_EQ(TASK_RUNNING, update->state());
+ EXPECT_TRUE(update->has_slave_id());
- const TaskID taskId = update.get().task_id();
- const SlaveID slaveId = update.get().slave_id();
+ const TaskID taskId = update->task_id();
+ const SlaveID slaveId = update->slave_id();
// Framework should not receive a status update.
EXPECT_CALL(sched, statusUpdate(&driver, _))
@@ -215,8 +215,8 @@ TEST_F(ReconciliationTest, TaskStateMatch)
driver.reconcileTasks({status});
AWAIT_READY(update2);
- EXPECT_EQ(TASK_RUNNING, update2.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update2.get().reason());
+ EXPECT_EQ(TASK_RUNNING, update2->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update2->reason());
EXPECT_CALL(exec, shutdown(_))
.Times(AtMost(1));
@@ -265,9 +265,9 @@ TEST_F(ReconciliationTest, UnknownSlave)
// Framework should receive TASK_UNKNOWN because the slave is unknown.
AWAIT_READY(update);
- EXPECT_EQ(TASK_UNKNOWN, update.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update.get().reason());
- EXPECT_FALSE(update.get().has_unreachable_time());
+ EXPECT_EQ(TASK_UNKNOWN, update->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update->reason());
+ EXPECT_FALSE(update->has_unreachable_time());
driver.stop();
driver.join();
@@ -291,7 +291,7 @@ TEST_F(ReconciliationTest, UnknownTask)
// Wait for the slave to register and get the slave id.
AWAIT_READY(slaveRegisteredMessage);
- const SlaveID slaveId = slaveRegisteredMessage.get().slave_id();
+ const SlaveID slaveId = slaveRegisteredMessage->slave_id();
MockScheduler sched;
MesosSchedulerDriver driver(
@@ -323,9 +323,9 @@ TEST_F(ReconciliationTest, UnknownTask)
// Framework should receive TASK_LOST for an unknown task.
AWAIT_READY(update);
- EXPECT_EQ(TASK_LOST, update.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update.get().reason());
- EXPECT_FALSE(update.get().has_unreachable_time());
+ EXPECT_EQ(TASK_LOST, update->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update->reason());
+ EXPECT_FALSE(update->has_unreachable_time());
driver.stop();
driver.join();
@@ -349,7 +349,7 @@ TEST_F(ReconciliationTest, UnknownTaskPartitionAware)
// Wait for the slave to register and get the slave id.
AWAIT_READY(slaveRegisteredMessage);
- const SlaveID slaveId = slaveRegisteredMessage.get().slave_id();
+ const SlaveID slaveId = slaveRegisteredMessage->slave_id();
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
frameworkInfo.add_capabilities()->set_type(
@@ -385,9 +385,9 @@ TEST_F(ReconciliationTest, UnknownTaskPartitionAware)
// Framework should receive TASK_UNKNOWN for an unknown task.
AWAIT_READY(update);
- EXPECT_EQ(TASK_UNKNOWN, update.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update.get().reason());
- EXPECT_FALSE(update.get().has_unreachable_time());
+ EXPECT_EQ(TASK_UNKNOWN, update->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update->reason());
+ EXPECT_FALSE(update->has_unreachable_time());
driver.stop();
driver.join();
@@ -427,9 +427,9 @@ TEST_F(ReconciliationTest, UnknownKillTask)
// Framework should receive TASK_LOST for unknown task.
AWAIT_READY(update);
- EXPECT_EQ(TASK_LOST, update.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update.get().reason());
- EXPECT_FALSE(update.get().has_unreachable_time());
+ EXPECT_EQ(TASK_LOST, update->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update->reason());
+ EXPECT_FALSE(update->has_unreachable_time());
driver.stop();
driver.join();
@@ -459,7 +459,7 @@ TEST_F(ReconciliationTest, RecoveredAgent)
// Wait for the slave to register and get the slave id.
AWAIT_READY(slaveRegisteredMessage);
- const SlaveID slaveId = slaveRegisteredMessage.get().slave_id();
+ const SlaveID slaveId = slaveRegisteredMessage->slave_id();
// Stop the master.
master->reset();
@@ -545,7 +545,7 @@ TEST_F(ReconciliationTest, RecoveredAgentReregistrationInProgress)
// Wait for the slave to register and get the slave id.
AWAIT_READY(slaveRegisteredMessage);
- const SlaveID slaveId = slaveRegisteredMessage.get().slave_id();
+ const SlaveID slaveId = slaveRegisteredMessage->slave_id();
// Stop the master.
master->reset();
@@ -595,7 +595,7 @@ TEST_F(ReconciliationTest, RecoveredAgentReregistrationInProgress)
AWAIT_READY(reregister);
EXPECT_NE(
nullptr,
- dynamic_cast<master::MarkSlaveReachable*>(reregister.get().get()));
+ dynamic_cast<master::MarkSlaveReachable*>(reregister->get()));
Future<mesos::scheduler::Call> reconcileCall = FUTURE_CALL(
mesos::scheduler::Call(), mesos::scheduler::Call::RECONCILE, _ , _);
@@ -642,7 +642,7 @@ TEST_F(ReconciliationTest, RemovalInProgress)
// Wait for the slave to register and get the slave id.
AWAIT_READY(slaveRegisteredMessage);
- const SlaveID slaveId = slaveRegisteredMessage.get().slave_id();
+ const SlaveID slaveId = slaveRegisteredMessage->slave_id();
Future<UnregisterSlaveMessage> unregisterSlaveMessage =
FUTURE_PROTOBUF(
@@ -668,7 +668,7 @@ TEST_F(ReconciliationTest, RemovalInProgress)
AWAIT_READY(unregister);
EXPECT_NE(
nullptr,
- dynamic_cast<master::RemoveSlave*>(unregister.get().get()));
+ dynamic_cast<master::RemoveSlave*>(unregister->get()));
MockScheduler sched;
MesosSchedulerDriver driver(
@@ -699,9 +699,9 @@ TEST_F(ReconciliationTest, RemovalInProgress)
driver.reconcileTasks({status});
AWAIT_READY(update);
- EXPECT_EQ(TASK_LOST, update.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update.get().reason());
- EXPECT_FALSE(update.get().has_unreachable_time());
+ EXPECT_EQ(TASK_LOST, update->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update->reason());
+ EXPECT_FALSE(update->has_unreachable_time());
driver.stop();
driver.join();
@@ -750,8 +750,8 @@ TEST_F(ReconciliationTest, ImplicitNonTerminalTask)
AWAIT_READY(frameworkId);
AWAIT_READY(update);
- EXPECT_EQ(TASK_RUNNING, update.get().state());
- EXPECT_TRUE(update.get().has_slave_id());
+ EXPECT_EQ(TASK_RUNNING, update->state());
+ EXPECT_TRUE(update->has_slave_id());
// When making an implicit reconciliation request, the non-terminal
// task should be sent back.
@@ -762,8 +762,8 @@ TEST_F(ReconciliationTest, ImplicitNonTerminalTask)
driver.reconcileTasks({});
AWAIT_READY(update2);
- EXPECT_EQ(TASK_RUNNING, update2.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update2.get().reason());
+ EXPECT_EQ(TASK_RUNNING, update2->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update2->reason());
EXPECT_CALL(exec, shutdown(_))
.Times(AtMost(1));
@@ -817,8 +817,8 @@ TEST_F(ReconciliationTest, ImplicitTerminalTask)
AWAIT_READY(frameworkId);
AWAIT_READY(update);
- EXPECT_EQ(TASK_FINISHED, update.get().state());
- EXPECT_TRUE(update.get().has_slave_id());
+ EXPECT_EQ(TASK_FINISHED, update->state());
+ EXPECT_TRUE(update->has_slave_id());
// Framework should not receive any further updates.
EXPECT_CALL(sched, statusUpdate(&driver, _))
@@ -869,7 +869,7 @@ TEST_F(ReconciliationTest, PendingTask)
// Wait for the slave to register and get the slave id.
AWAIT_READY(slaveRegisteredMessage);
- const SlaveID slaveId = slaveRegisteredMessage.get().slave_id();
+ const SlaveID slaveId = slaveRegisteredMessage->slave_id();
MockScheduler sched;
MesosSchedulerDriver driver(
@@ -885,7 +885,7 @@ TEST_F(ReconciliationTest, PendingTask)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ EXPECT_NE(0u, offers->size());
// Return a pending future from authorizer.
Future<Nothing> authorize;
@@ -909,9 +909,9 @@ TEST_F(ReconciliationTest, PendingTask)
driver.reconcileTasks({});
AWAIT_READY(update);
- EXPECT_EQ(TASK_STAGING, update.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update.get().reason());
- EXPECT_TRUE(update.get().has_slave_id());
+ EXPECT_EQ(TASK_STAGING, update->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update->reason());
+ EXPECT_TRUE(update->has_slave_id());
// Now send an explicit reconciliation request for this task.
Future<TaskStatus> update2;
@@ -926,9 +926,9 @@ TEST_F(ReconciliationTest, PendingTask)
driver.reconcileTasks({status});
AWAIT_READY(update2);
- EXPECT_EQ(TASK_STAGING, update2.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update2.get().reason());
- EXPECT_TRUE(update2.get().has_slave_id());
+ EXPECT_EQ(TASK_STAGING, update2->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update2->reason());
+ EXPECT_TRUE(update2->has_slave_id());
driver.stop();
driver.join();
@@ -990,8 +990,8 @@ TEST_F(ReconciliationTest, UnacknowledgedTerminalTask)
AWAIT_READY(frameworkId);
AWAIT_READY(update1);
- EXPECT_EQ(TASK_FINISHED, update1.get().state());
- EXPECT_TRUE(update1.get().has_slave_id());
+ EXPECT_EQ(TASK_FINISHED, update1->state());
+ EXPECT_TRUE(update1->has_slave_id());
// Framework should receive a TASK_FINISHED update, since the
// master did not receive the acknowledgement.
@@ -1005,9 +1005,9 @@ TEST_F(ReconciliationTest, UnacknowledgedTerminalTask)
driver.reconcileTasks({});
AWAIT_READY(update2);
- EXPECT_EQ(TASK_FINISHED, update2.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update2.get().reason());
- EXPECT_TRUE(update2.get().has_slave_id());
+ EXPECT_EQ(TASK_FINISHED, update2->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update2->reason());
+ EXPECT_TRUE(update2->has_slave_id());
driver.stop();
driver.join();
@@ -1078,7 +1078,7 @@ TEST_F(ReconciliationTest, ReconcileStatusUpdateTaskState)
// Now send TASK_FINISHED update.
TaskStatus finishedStatus;
- finishedStatus = statusUpdateMessage.get().update().status();
+ finishedStatus = statusUpdateMessage->update().status();
finishedStatus.set_state(TASK_FINISHED);
execDriver->sendStatusUpdate(finishedStatus);
@@ -1128,8 +1128,8 @@ TEST_F(ReconciliationTest, ReconcileStatusUpdateTaskState)
driver.reconcileTasks({});
AWAIT_READY(update);
- EXPECT_EQ(TASK_RUNNING, update.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update.get().reason());
+ EXPECT_EQ(TASK_RUNNING, update->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, update->reason());
EXPECT_CALL(exec, shutdown(_))
.Times(AtMost(1));
@@ -1174,7 +1174,7 @@ TEST_F(ReconciliationTest, PartitionedAgentThenMasterFailover)
driver.start();
AWAIT_READY(offers);
- ASSERT_FALSE(offers.get().empty());
+ ASSERT_FALSE(offers->empty());
Offer offer = offers.get()[0];
@@ -1191,10 +1191,10 @@ TEST_F(ReconciliationTest, PartitionedAgentThenMasterFailover)
driver.launchTasks(offer.id(), {task});
AWAIT_READY(runningStatus);
- EXPECT_EQ(TASK_RUNNING, runningStatus.get().state());
- EXPECT_EQ(task.task_id(), runningStatus.get().task_id());
+ EXPECT_EQ(TASK_RUNNING, runningStatus->state());
+ EXPECT_EQ(task.task_id(), runningStatus->task_id());
- const SlaveID slaveId = runningStatus.get().slave_id();
+ const SlaveID slaveId = runningStatus->slave_id();
AWAIT_READY(statusUpdateAck);
@@ -1233,11 +1233,11 @@ TEST_F(ReconciliationTest, PartitionedAgentThenMasterFailover)
Clock::advance(Milliseconds(100));
AWAIT_READY(lostStatus);
- EXPECT_EQ(TASK_LOST, lostStatus.get().state());
- EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, lostStatus.get().reason());
- EXPECT_EQ(task.task_id(), lostStatus.get().task_id());
- EXPECT_EQ(slaveId, lostStatus.get().slave_id());
- EXPECT_EQ(partitionTime, lostStatus.get().unreachable_time());
+ EXPECT_EQ(TASK_LOST, lostStatus->state());
+ EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, lostStatus->reason());
+ EXPECT_EQ(task.task_id(), lostStatus->task_id());
+ EXPECT_EQ(slaveId, lostStatus->slave_id());
+ EXPECT_EQ(partitionTime, lostStatus->unreachable_time());
AWAIT_READY(slaveLost);
@@ -1254,9 +1254,9 @@ TEST_F(ReconciliationTest, PartitionedAgentThenMasterFailover)
driver.reconcileTasks({status1});
AWAIT_READY(reconcileUpdate1);
- EXPECT_EQ(TASK_LOST, reconcileUpdate1.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate1.get().reason());
- EXPECT_EQ(partitionTime, reconcileUpdate1.get().unreachable_time());
+ EXPECT_EQ(TASK_LOST, reconcileUpdate1->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate1->reason());
+ EXPECT_EQ(partitionTime, reconcileUpdate1->unreachable_time());
// Drop all subsequent messages from the slave, since they aren't
// useful anymore.
@@ -1292,9 +1292,9 @@ TEST_F(ReconciliationTest, PartitionedAgentThenMasterFailover)
driver.reconcileTasks({status2});
AWAIT_READY(reconcileUpdate2);
- EXPECT_EQ(TASK_LOST, reconcileUpdate2.get().state());
- EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate2.get().reason());
- EXPECT_EQ(partitionTime, reconcileUpdate2.get().unreachable_time());
+ EXPECT_EQ(TASK_LOST, reconcileUpdate2->state());
+ EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate2->reason());
+ EXPECT_EQ(partitionTime, reconcileUpdate2->unreachable_time());
Clock::resume();
http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/registrar_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/registrar_tests.cpp b/src/tests/registrar_tests.cpp
index fb693ea..5c6fb56 100644
--- a/src/tests/registrar_tests.cpp
+++ b/src/tests/registrar_tests.cpp
@@ -245,7 +245,7 @@ TEST_F(RegistrarTest, Recover)
Owned<Operation>(new RemoveSlave(slave)));
AWAIT_READY(registry);
- EXPECT_EQ(master, registry.get().master().info());
+ EXPECT_EQ(master, registry->master().info());
AWAIT_TRUE(admit);
AWAIT_TRUE(unreachable);
@@ -441,7 +441,7 @@ TEST_F(RegistrarTest, Remove)
// For example:
// MaintenanceTest(flags, state, [=](const Registry& registry) {
// // Checks and operations. i.e.:
-// EXPECT_EQ(1, registry.get().schedules().size());
+// EXPECT_EQ(1, registry->schedules().size());
// });
// Adds maintenance schedules to the registry, one machine at a time.
@@ -480,13 +480,13 @@ TEST_F(RegistrarTest, UpdateMaintenanceSchedule)
Future<Registry> registry = registrar.recover(master);
AWAIT_READY(registry);
- EXPECT_EQ(1, registry.get().schedules().size());
- EXPECT_EQ(1, registry.get().schedules(0).windows().size());
- EXPECT_EQ(1, registry.get().schedules(0).windows(0).machine_ids().size());
- EXPECT_EQ(1, registry.get().machines().machines().size());
+ EXPECT_EQ(1, registry->schedules().size());
+ EXPECT_EQ(1, registry->schedules(0).windows().size());
+ EXPECT_EQ(1, registry->schedules(0).windows(0).machine_ids().size());
+ EXPECT_EQ(1, registry->machines().machines().size());
EXPECT_EQ(
MachineInfo::DRAINING,
- registry.get().machines().machines(0).info().mode());
+ registry->machines().machines(0).info().mode());
// Extend the schedule by one machine (in a different window).
maintenance::Schedule schedule = createSchedule({
@@ -503,14 +503,14 @@ TEST_F(RegistrarTest, UpdateMaintenanceSchedule)
Future<Registry> registry = registrar.recover(master);
AWAIT_READY(registry);
- EXPECT_EQ(1, registry.get().schedules().size());
- EXPECT_EQ(2, registry.get().schedules(0).windows().size());
- EXPECT_EQ(1, registry.get().schedules(0).windows(0).machine_ids().size());
- EXPECT_EQ(1, registry.get().schedules(0).windows(1).machine_ids().size());
- EXPECT_EQ(2, registry.get().machines().machines().size());
+ EXPECT_EQ(1, registry->schedules().size());
+ EXPECT_EQ(2, registry->schedules(0).windows().size());
+ EXPECT_EQ(1, registry->schedules(0).windows(0).machine_ids().size());
+ EXPECT_EQ(1, registry->schedules(0).windows(1).machine_ids().size());
+ EXPECT_EQ(2, registry->machines().machines().size());
EXPECT_EQ(
MachineInfo::DRAINING,
- registry.get().machines().machines(1).info().mode());
+ registry->machines().machines(1).info().mode());
// Extend a window by one machine.
maintenance::Schedule schedule = createSchedule({
@@ -527,14 +527,14 @@ TEST_F(RegistrarTest, UpdateMaintenanceSchedule)
Future<Registry> registry = registrar.recover(master);
AWAIT_READY(registry);
- EXPECT_EQ(1, registry.get().schedules().size());
- EXPECT_EQ(2, registry.get().schedules(0).windows().size());
- EXPECT_EQ(1, registry.get().schedules(0).windows(0).machine_ids().size());
- EXPECT_EQ(2, registry.get().schedules(0).windows(1).machine_ids().size());
- EXPECT_EQ(3, registry.get().machines().machines().size());
+ EXPECT_EQ(1, registry->schedules().size());
+ EXPECT_EQ(2, registry->schedules(0).windows().size());
+ EXPECT_EQ(1, registry->schedules(0).windows(0).machine_ids().size());
+ EXPECT_EQ(2, registry->schedules(0).windows(1).machine_ids().size());
+ EXPECT_EQ(3, registry->machines().machines().size());
EXPECT_EQ(
MachineInfo::DRAINING,
- registry.get().machines().machines(2).info().mode());
+ registry->machines().machines(2).info().mode());
// Rearrange the schedule into one window.
maintenance::Schedule schedule = createSchedule(
@@ -550,21 +550,21 @@ TEST_F(RegistrarTest, UpdateMaintenanceSchedule)
Future<Registry> registry = registrar.recover(master);
AWAIT_READY(registry);
- EXPECT_EQ(1, registry.get().schedules().size());
- EXPECT_EQ(1, registry.get().schedules(0).windows().size());
- EXPECT_EQ(3, registry.get().schedules(0).windows(0).machine_ids().size());
- EXPECT_EQ(3, registry.get().machines().machines().size());
+ EXPECT_EQ(1, registry->schedules().size());
+ EXPECT_EQ(1, registry->schedules(0).windows().size());
+ EXPECT_EQ(3, registry->schedules(0).windows(0).machine_ids().size());
+ EXPECT_EQ(3, registry->machines().machines().size());
EXPECT_EQ(
MachineInfo::DRAINING,
- registry.get().machines().machines(0).info().mode());
+ registry->machines().machines(0).info().mode());
EXPECT_EQ(
MachineInfo::DRAINING,
- registry.get().machines().machines(1).info().mode());
+ registry->machines().machines(1).info().mode());
EXPECT_EQ(
MachineInfo::DRAINING,
- registry.get().machines().machines(2).info().mode());
+ registry->machines().machines(2).info().mode());
// Delete one machine from the schedule.
maintenance::Schedule schedule = createSchedule(
@@ -580,10 +580,10 @@ TEST_F(RegistrarTest, UpdateMaintenanceSchedule)
Future<Registry> registry = registrar.recover(master);
AWAIT_READY(registry);
- EXPECT_EQ(1, registry.get().schedules().size());
- EXPECT_EQ(1, registry.get().schedules(0).windows().size());
- EXPECT_EQ(2, registry.get().schedules(0).windows(0).machine_ids().size());
- EXPECT_EQ(2, registry.get().machines().machines().size());
+ EXPECT_EQ(1, registry->schedules().size());
+ EXPECT_EQ(1, registry->schedules(0).windows().size());
+ EXPECT_EQ(2, registry->schedules(0).windows(0).machine_ids().size());
+ EXPECT_EQ(2, registry->machines().machines().size());
// Delete all machines from the schedule.
maintenance::Schedule schedule;
@@ -597,9 +597,9 @@ TEST_F(RegistrarTest, UpdateMaintenanceSchedule)
Future<Registry> registry = registrar.recover(master);
AWAIT_READY(registry);
- EXPECT_EQ(1, registry.get().schedules().size());
- EXPECT_EQ(0, registry.get().schedules(0).windows().size());
- EXPECT_EQ(0, registry.get().machines().machines().size());
+ EXPECT_EQ(1, registry->schedules().size());
+ EXPECT_EQ(0, registry->schedules(0).windows().size());
+ EXPECT_EQ(0, registry->machines().machines().size());
}
}
@@ -645,14 +645,14 @@ TEST_F(RegistrarTest, StartMaintenance)
Future<Registry> registry = registrar.recover(master);
AWAIT_READY(registry);
- EXPECT_EQ(2, registry.get().machines().machines().size());
+ EXPECT_EQ(2, registry->machines().machines().size());
EXPECT_EQ(
MachineInfo::DRAINING,
- registry.get().machines().machines(0).info().mode());
+ registry->machines().machines(0).info().mode());
EXPECT_EQ(
MachineInfo::DOWN,
- registry.get().machines().machines(1).info().mode());
+ registry->machines().machines(1).info().mode());
// Schedule three machines for maintenance.
maintenance::Schedule schedule = createSchedule(
@@ -675,18 +675,18 @@ TEST_F(RegistrarTest, StartMaintenance)
Future<Registry> registry = registrar.recover(master);
AWAIT_READY(registry);
- EXPECT_EQ(3, registry.get().machines().machines().size());
+ EXPECT_EQ(3, registry->machines().machines().size());
EXPECT_EQ(
MachineInfo::DOWN,
- registry.get().machines().machines(0).info().mode());
+ registry->machines().machines(0).info().mode());
EXPECT_EQ(
MachineInfo::DOWN,
- registry.get().machines().machines(1).info().mode());
+ registry->machines().machines(1).info().mode());
EXPECT_EQ(
MachineInfo::DOWN,
- registry.get().machines().machines(2).info().mode());
+ registry->machines().machines(2).info().mode());
}
}
@@ -737,17 +737,17 @@ TEST_F(RegistrarTest, StopMaintenance)
Future<Registry> registry = registrar.recover(master);
AWAIT_READY(registry);
- EXPECT_EQ(1, registry.get().schedules().size());
- EXPECT_EQ(1, registry.get().schedules(0).windows().size());
- EXPECT_EQ(2, registry.get().schedules(0).windows(0).machine_ids().size());
- EXPECT_EQ(2, registry.get().machines().machines().size());
+ EXPECT_EQ(1, registry->schedules().size());
+ EXPECT_EQ(1, registry->schedules(0).windows().size());
+ EXPECT_EQ(2, registry->schedules(0).windows(0).machine_ids().size());
+ EXPECT_EQ(2, registry->machines().machines().size());
EXPECT_EQ(
MachineInfo::DRAINING,
- registry.get().machines().machines(0).info().mode());
+ registry->machines().machines(0).info().mode());
EXPECT_EQ(
MachineInfo::DRAINING,
- registry.get().machines().machines(1).info().mode());
+ registry->machines().machines(1).info().mode());
// Transition machine one and two into `DOWN` mode.
RepeatedPtrField<MachineID> machines =
@@ -767,8 +767,8 @@ TEST_F(RegistrarTest, StopMaintenance)
Future<Registry> registry = registrar.recover(master);
AWAIT_READY(registry);
- EXPECT_EQ(0, registry.get().schedules().size());
- EXPECT_EQ(0, registry.get().machines().machines().size());
+ EXPECT_EQ(0, registry->schedules().size());
+ EXPECT_EQ(0, registry->machines().machines().size());
}
}
@@ -816,11 +816,11 @@ TEST_F(RegistrarTest, UpdateQuota)
AWAIT_READY(registry);
// Check that the recovered quota matches the one we stored.
- ASSERT_EQ(1, registry.get().quotas().size());
- EXPECT_EQ(ROLE1, registry.get().quotas(0).info().role());
- ASSERT_EQ(2, registry.get().quotas(0).info().guarantee().size());
+ ASSERT_EQ(1, registry->quotas().size());
+ EXPECT_EQ(ROLE1, registry->quotas(0).info().role());
+ ASSERT_EQ(2, registry->quotas(0).info().guarantee().size());
- Resources storedResources(registry.get().quotas(0).info().guarantee());
+ Resources storedResources(registry->quotas(0).info().guarantee());
EXPECT_EQ(quotaResources1, storedResources);
// Change quota for `ROLE1`.
@@ -836,11 +836,11 @@ TEST_F(RegistrarTest, UpdateQuota)
AWAIT_READY(registry);
// Check that the recovered quota matches the one we updated.
- ASSERT_EQ(1, registry.get().quotas().size());
- EXPECT_EQ(ROLE1, registry.get().quotas(0).info().role());
- ASSERT_EQ(1, registry.get().quotas(0).info().guarantee().size());
+ ASSERT_EQ(1, registry->quotas().size());
+ EXPECT_EQ(ROLE1, registry->quotas(0).info().role());
+ ASSERT_EQ(1, registry->quotas(0).info().guarantee().size());
- Resources storedResources(registry.get().quotas(0).info().guarantee());
+ Resources storedResources(registry->quotas(0).info().guarantee());
EXPECT_EQ(quotaResources2, storedResources);
// Store one more quota for a role without quota.
@@ -856,14 +856,14 @@ TEST_F(RegistrarTest, UpdateQuota)
// NOTE: We assume quota messages are stored in order they have
// been added.
// TODO(alexr): Consider removing dependency on the order.
- ASSERT_EQ(2, registry.get().quotas().size());
- EXPECT_EQ(ROLE1, registry.get().quotas(0).info().role());
- ASSERT_EQ(1, registry.get().quotas(0).info().guarantee().size());
+ ASSERT_EQ(2, registry->quotas().size());
+ EXPECT_EQ(ROLE1, registry->quotas(0).info().role());
+ ASSERT_EQ(1, registry->quotas(0).info().guarantee().size());
- EXPECT_EQ(ROLE2, registry.get().quotas(1).info().role());
- ASSERT_EQ(2, registry.get().quotas(1).info().guarantee().size());
+ EXPECT_EQ(ROLE2, registry->quotas(1).info().role());
+ ASSERT_EQ(2, registry->quotas(1).info().guarantee().size());
- Resources storedResources(registry.get().quotas(1).info().guarantee());
+ Resources storedResources(registry->quotas(1).info().guarantee());
EXPECT_EQ(quotaResources1, storedResources);
// Change quota for `role2`.
@@ -883,18 +883,18 @@ TEST_F(RegistrarTest, UpdateQuota)
// NOTE: We assume quota messages are stored in order they have been
// added and update does not change the order.
// TODO(alexr): Consider removing dependency on the order.
- ASSERT_EQ(2, registry.get().quotas().size());
+ ASSERT_EQ(2, registry->quotas().size());
- EXPECT_EQ(ROLE1, registry.get().quotas(0).info().role());
- ASSERT_EQ(1, registry.get().quotas(0).info().guarantee().size());
+ EXPECT_EQ(ROLE1, registry->quotas(0).info().role());
+ ASSERT_EQ(1, registry->quotas(0).info().guarantee().size());
- Resources storedResources1(registry.get().quotas(0).info().guarantee());
+ Resources storedResources1(registry->quotas(0).info().guarantee());
EXPECT_EQ(quotaResources2, storedResources1);
- EXPECT_EQ(ROLE2, registry.get().quotas(1).info().role());
- ASSERT_EQ(1, registry.get().quotas(1).info().guarantee().size());
+ EXPECT_EQ(ROLE2, registry->quotas(1).info().role());
+ ASSERT_EQ(1, registry->quotas(1).info().guarantee().size());
- Resources storedResources2(registry.get().quotas(1).info().guarantee());
+ Resources storedResources2(registry->quotas(1).info().guarantee());
EXPECT_EQ(quotaResources2, storedResources2);
}
}
@@ -946,9 +946,9 @@ TEST_F(RegistrarTest, RemoveQuota)
// NOTE: We assume quota messages are stored in order they have been
// added.
// TODO(alexr): Consider removing dependency on the order.
- ASSERT_EQ(2, registry.get().quotas().size());
- EXPECT_EQ(ROLE1, registry.get().quotas(0).info().role());
- EXPECT_EQ(ROLE2, registry.get().quotas(1).info().role());
+ ASSERT_EQ(2, registry->quotas().size());
+ EXPECT_EQ(ROLE1, registry->quotas(0).info().role());
+ EXPECT_EQ(ROLE2, registry->quotas(1).info().role());
// Remove quota for `role2`.
AWAIT_TRUE(registrar.apply(Owned<Operation>(new RemoveQuota(ROLE2))));
@@ -960,8 +960,8 @@ TEST_F(RegistrarTest, RemoveQuota)
AWAIT_READY(registry);
// Check that there is only one quota left in the registry.
- ASSERT_EQ(1, registry.get().quotas().size());
- EXPECT_EQ(ROLE1, registry.get().quotas(0).info().role());
+ ASSERT_EQ(1, registry->quotas().size());
+ EXPECT_EQ(ROLE1, registry->quotas(0).info().role());
// Remove quota for `ROLE1`.
AWAIT_TRUE(registrar.apply(Owned<Operation>(new RemoveQuota(ROLE1))));
@@ -973,7 +973,7 @@ TEST_F(RegistrarTest, RemoveQuota)
AWAIT_READY(registry);
// Check that there are no more quotas at this point.
- ASSERT_EQ(0, registry.get().quotas().size());
+ ASSERT_EQ(0, registry->quotas().size());
}
}
@@ -994,7 +994,7 @@ TEST_F(RegistrarTest, UpdateWeights)
Future<Registry> registry = registrar.recover(master);
AWAIT_READY(registry);
- ASSERT_EQ(0, registry.get().weights_size());
+ ASSERT_EQ(0, registry->weights_size());
// Store the weight for 'ROLE1' previously without weight.
hashmap<string, double> weights;
@@ -1012,9 +1012,9 @@ TEST_F(RegistrarTest, UpdateWeights)
// Check that the recovered weights matches the weights we stored
// previously.
- ASSERT_EQ(1, registry.get().weights_size());
- EXPECT_EQ(ROLE1, registry.get().weights(0).info().role());
- ASSERT_EQ(WEIGHT1, registry.get().weights(0).info().weight());
+ ASSERT_EQ(1, registry->weights_size());
+ EXPECT_EQ(ROLE1, registry->weights(0).info().role());
+ ASSERT_EQ(WEIGHT1, registry->weights(0).info().weight());
// Change weight for 'ROLE1', and store the weight for 'ROLE2'.
hashmap<string, double> weights;
@@ -1033,11 +1033,11 @@ TEST_F(RegistrarTest, UpdateWeights)
// Check that the recovered weights matches the weights we updated
// previously.
- ASSERT_EQ(2, registry.get().weights_size());
- EXPECT_EQ(ROLE1, registry.get().weights(0).info().role());
- ASSERT_EQ(UPDATED_WEIGHT1, registry.get().weights(0).info().weight());
- EXPECT_EQ(ROLE2, registry.get().weights(1).info().role());
- ASSERT_EQ(WEIGHT2, registry.get().weights(1).info().weight());
+ ASSERT_EQ(2, registry->weights_size());
+ EXPECT_EQ(ROLE1, registry->weights(0).info().role());
+ ASSERT_EQ(UPDATED_WEIGHT1, registry->weights(0).info().weight());
+ EXPECT_EQ(ROLE2, registry->weights(1).info().role());
+ ASSERT_EQ(WEIGHT2, registry->weights(1).info().weight());
}
}
@@ -1062,8 +1062,8 @@ TEST_F(RegistrarTest, Bootstrap)
AWAIT_READY(registry);
- ASSERT_EQ(1, registry.get().slaves().slaves().size());
- EXPECT_EQ(slave, registry.get().slaves().slaves(0).info());
+ ASSERT_EQ(1, registry->slaves().slaves().size());
+ EXPECT_EQ(slave, registry->slaves().slaves(0).info());
}
}
@@ -1187,7 +1187,7 @@ TEST_F(RegistrarTest, Authentication)
// Requests without credentials should be rejected.
Future<Response> response = process::http::get(registrar.pid(), "registry");
AWAIT_EXPECT_RESPONSE_STATUS_EQ(Unauthorized({}).status, response)
- << response.get().body;
+ << response->body;
Credential badCredential;
badCredential.set_principal("bad-principal");
@@ -1200,7 +1200,7 @@ TEST_F(RegistrarTest, Authentication)
None(),
createBasicAuthHeaders(badCredential));
AWAIT_EXPECT_RESPONSE_STATUS_EQ(Unauthorized({}).status, response)
- << response.get().body;
+ << response->body;
// Requests with good credentials should be permitted.
response = process::http::get(
@@ -1209,7 +1209,7 @@ TEST_F(RegistrarTest, Authentication)
None(),
createBasicAuthHeaders(DEFAULT_CREDENTIAL));
AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
- << response.get().body;
+ << response->body;
AWAIT_READY(authentication::unsetAuthenticator(AUTHENTICATION_REALM));
}
@@ -1286,7 +1286,7 @@ TEST_P(Registrar_BENCHMARK_Test, Performance)
Future<Registry> registry = registrar2.recover(info);
AWAIT_READY(registry);
LOG(INFO) << "Recovered " << slaveCount << " agents ("
- << Bytes(registry.get().ByteSize()) << ") in " << watch.elapsed();
+ << Bytes(registry->ByteSize()) << ") in " << watch.elapsed();
// Shuffle the slaves so we are removing them in random order (same
// as in production).
http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/registrar_zookeeper_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/registrar_zookeeper_tests.cpp b/src/tests/registrar_zookeeper_tests.cpp
index a31942d..cc082d3 100644
--- a/src/tests/registrar_zookeeper_tests.cpp
+++ b/src/tests/registrar_zookeeper_tests.cpp
@@ -85,7 +85,7 @@ TEST_F(RegistrarZooKeeperTest, TaskRunning)
driver.start();
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ EXPECT_NE(0u, offers->size());
TaskInfo task = createTask(offers.get()[0], "dummy", DEFAULT_EXECUTOR_ID);
@@ -107,7 +107,7 @@ TEST_F(RegistrarZooKeeperTest, TaskRunning)
driver.launchTasks(offers.get()[0].id(), {task});
AWAIT_READY(status);
- EXPECT_EQ(TASK_RUNNING, status.get().state());
+ EXPECT_EQ(TASK_RUNNING, status->state());
AWAIT_READY(resourcesUpdated);