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:29 UTC

[1/8] mesos git commit: Replace `.get().` in favor of the `->` operator in tests.

Repository: mesos
Updated Branches:
  refs/heads/master f153035c8 -> 613d3ee3d


http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/slave_recovery_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp
index dc82db9..e6b2bdd 100644
--- a/src/tests/slave_recovery_tests.cpp
+++ b/src/tests/slave_recovery_tests.cpp
@@ -211,10 +211,10 @@ TYPED_TEST(SlaveRecoveryTest, RecoverSlaveState)
 
   // Capture the framework pid.
   AWAIT_READY(subscribeMessage);
-  UPID frameworkPid = subscribeMessage.get().from;
+  UPID frameworkPid = subscribeMessage->from;
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   SlaveID slaveId = offers.get()[0].slave_id();
 
@@ -243,13 +243,13 @@ TYPED_TEST(SlaveRecoveryTest, RecoverSlaveState)
   AWAIT_READY(registerExecutorMessage);
 
   RegisterExecutorMessage registerExecutor;
-  registerExecutor.ParseFromString(registerExecutorMessage.get().body);
+  registerExecutor.ParseFromString(registerExecutorMessage->body);
   ExecutorID executorId = registerExecutor.executor_id();
-  UPID libprocessPid = registerExecutorMessage.get().from;
+  UPID libprocessPid = registerExecutorMessage->from;
 
   // Capture the update.
   AWAIT_READY(update);
-  EXPECT_EQ(TASK_RUNNING, update.get().update().status().state());
+  EXPECT_EQ(TASK_RUNNING, update->update().status().state());
 
   // Wait for the ACK to be checkpointed.
   AWAIT_READY(_ack);
@@ -259,9 +259,9 @@ TYPED_TEST(SlaveRecoveryTest, RecoverSlaveState)
       paths::getMetaRootDir(flags.work_dir), true);
 
   ASSERT_SOME(recover);
-  ASSERT_SOME(recover.get().slave);
+  ASSERT_SOME(recover->slave);
 
-  slave::state::SlaveState state = recover.get().slave.get();
+  slave::state::SlaveState state = recover->slave.get();
 
   // Check slave id.
   ASSERT_EQ(slaveId, state.id);
@@ -321,7 +321,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverSlaveState)
         .updates.size());
 
   ASSERT_EQ(
-      update.get().update().uuid(),
+      update->update().uuid(),
       state
         .frameworks[frameworkId]
         .executors[executorId]
@@ -329,7 +329,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverSlaveState)
         .tasks[task.task_id()]
         .updates.front().uuid());
 
-  const UUID uuid = UUID::fromBytes(ack.get().acknowledge().uuid()).get();
+  const UUID uuid = UUID::fromBytes(ack->acknowledge().uuid()).get();
   ASSERT_TRUE(state
                 .frameworks[frameworkId]
                 .executors[executorId]
@@ -385,7 +385,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverStatusUpdateManager)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(offers.get()[0], "sleep 1000");
 
@@ -420,7 +420,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverStatusUpdateManager)
   ASSERT_SOME(slave);
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   driver.stop();
   driver.join();
@@ -472,7 +472,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_ReconnectHTTPExecutor)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Launch a task with the HTTP based command executor.
   TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -506,12 +506,12 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_ReconnectHTTPExecutor)
   // Ensure that the executor subscribes again.
   AWAIT_READY(subscribeCall);
 
-  EXPECT_EQ(1, subscribeCall.get().subscribe().unacknowledged_updates().size());
-  EXPECT_EQ(1, subscribeCall.get().subscribe().unacknowledged_tasks().size());
+  EXPECT_EQ(1, subscribeCall->subscribe().unacknowledged_updates().size());
+  EXPECT_EQ(1, subscribeCall->subscribe().unacknowledged_tasks().size());
 
   // Scheduler should receive the recovered update.
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   driver.stop();
   driver.join();
@@ -754,7 +754,7 @@ TYPED_TEST(SlaveRecoveryTest, ReconnectExecutor)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(offers.get()[0], "sleep 1000");
 
@@ -796,7 +796,7 @@ TYPED_TEST(SlaveRecoveryTest, ReconnectExecutor)
 
   // Scheduler should receive the recovered update.
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   driver.stop();
   driver.join();
@@ -847,7 +847,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_RecoverUnregisteredHTTPExecutor)
   driver.start();
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
 
   TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
 
@@ -959,7 +959,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverUnregisteredExecutor)
   driver.start();
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
 
   TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
 
@@ -1072,7 +1072,7 @@ TYPED_TEST(SlaveRecoveryTest, KillTaskUnregisteredExecutor)
   driver.start();
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
 
   TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
 
@@ -1182,7 +1182,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverTerminatedHTTPExecutor)
   driver.start();
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
 
   TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
 
@@ -1210,11 +1210,11 @@ TYPED_TEST(SlaveRecoveryTest, RecoverTerminatedHTTPExecutor)
     slave::state::recover(slave::paths::getMetaRootDir(flags.work_dir), true);
 
   ASSERT_SOME(state);
-  ASSERT_SOME(state.get().slave);
-  ASSERT_TRUE(state.get().slave.get().frameworks.contains(frameworkId.get()));
+  ASSERT_SOME(state->slave);
+  ASSERT_TRUE(state->slave->frameworks.contains(frameworkId.get()));
 
   slave::state::FrameworkState frameworkState =
-    state.get().slave.get().frameworks.get(frameworkId.get()).get();
+    state->slave->frameworks.get(frameworkId.get()).get();
 
   ASSERT_EQ(1u, frameworkState.executors.size());
 
@@ -1323,7 +1323,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverTerminatedExecutor)
   driver.start();
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
 
   TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
 
@@ -1339,7 +1339,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverTerminatedExecutor)
 
   // Capture the executor pid.
   AWAIT_READY(registerExecutor);
-  UPID executorPid = registerExecutor.get().from;
+  UPID executorPid = registerExecutor->from;
 
   // Wait for the ACK to be checkpointed.
   AWAIT_READY(ack);
@@ -1454,7 +1454,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_RecoveryTimeout)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(offers.get()[0], "sleep 1000");
 
@@ -1498,7 +1498,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_RecoveryTimeout)
 
   // Scheduler should receive the TASK_FAILED update.
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_FAILED, status.get().state());
+  EXPECT_EQ(TASK_FAILED, status->state());
 
   driver.stop();
   driver.join();
@@ -1546,7 +1546,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverCompletedExecutor)
   driver.start();
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
 
   TaskInfo task = createTask(offers1.get()[0], "exit 0");
 
@@ -1640,7 +1640,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_CleanupHTTPExecutor)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Launch a task with the HTTP based command executor.
   TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -1692,9 +1692,9 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_CleanupHTTPExecutor)
   // Scheduler should receive the TASK_LOST update.
   AWAIT_READY(status);
 
-  EXPECT_EQ(TASK_LOST, status.get().state());
-  EXPECT_EQ(TaskStatus::SOURCE_MASTER, status.get().source());
-  EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, status.get().reason());
+  EXPECT_EQ(TASK_LOST, status->state());
+  EXPECT_EQ(TaskStatus::SOURCE_MASTER, status->source());
+  EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, status->reason());
 
   driver.stop();
   driver.join();
@@ -1741,7 +1741,7 @@ TYPED_TEST(SlaveRecoveryTest, CleanupExecutor)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(offers.get()[0], "sleep 1000");
 
@@ -1794,9 +1794,9 @@ TYPED_TEST(SlaveRecoveryTest, CleanupExecutor)
   // Scheduler should receive the TASK_LOST update.
   AWAIT_READY(status);
 
-  EXPECT_EQ(TASK_LOST, status.get().state());
-  EXPECT_EQ(TaskStatus::SOURCE_MASTER, status.get().source());
-  EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, status.get().reason());
+  EXPECT_EQ(TASK_LOST, status->state());
+  EXPECT_EQ(TaskStatus::SOURCE_MASTER, status->source());
+  EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, status->reason());
 
   driver.stop();
   driver.join();
@@ -1842,7 +1842,7 @@ TYPED_TEST(SlaveRecoveryTest, RemoveNonCheckpointingFramework)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Launch 2 tasks from this offer.
   vector<TaskInfo> tasks;
@@ -1887,14 +1887,14 @@ TYPED_TEST(SlaveRecoveryTest, RemoveNonCheckpointingFramework)
 
   // Scheduler should receive the TASK_LOST updates.
   AWAIT_READY(status1);
-  EXPECT_EQ(TASK_LOST, status1.get().state());
-  EXPECT_EQ(TaskStatus::SOURCE_MASTER, status1.get().source());
-  EXPECT_EQ(TaskStatus::REASON_SLAVE_DISCONNECTED, status1.get().reason());
+  EXPECT_EQ(TASK_LOST, status1->state());
+  EXPECT_EQ(TaskStatus::SOURCE_MASTER, status1->source());
+  EXPECT_EQ(TaskStatus::REASON_SLAVE_DISCONNECTED, status1->reason());
 
   AWAIT_READY(status2);
-  EXPECT_EQ(TASK_LOST, status2.get().state());
-  EXPECT_EQ(TaskStatus::SOURCE_MASTER, status2.get().source());
-  EXPECT_EQ(TaskStatus::REASON_SLAVE_DISCONNECTED, status2.get().reason());
+  EXPECT_EQ(TASK_LOST, status2->state());
+  EXPECT_EQ(TaskStatus::SOURCE_MASTER, status2->source());
+  EXPECT_EQ(TaskStatus::REASON_SLAVE_DISCONNECTED, status2->reason());
 
   driver.stop();
   driver.join();
@@ -1957,7 +1957,7 @@ TYPED_TEST(SlaveRecoveryTest, NonCheckpointingFramework)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(offers.get()[0], "sleep 1000");
 
@@ -2052,7 +2052,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_KillTaskWithHTTPExecutor)
   driver.start();
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
 
   TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
 
@@ -2103,7 +2103,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_KillTaskWithHTTPExecutor)
 
   // Wait for TASK_KILLED update.
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_KILLED, status.get().state());
+  EXPECT_EQ(TASK_KILLED, status->state());
 
   Clock::pause();
 
@@ -2167,7 +2167,7 @@ TYPED_TEST(SlaveRecoveryTest, KillTask)
   driver.start();
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
 
   TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
 
@@ -2224,7 +2224,7 @@ TYPED_TEST(SlaveRecoveryTest, KillTask)
 
   // Wait for TASK_KILLED update.
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_KILLED, status.get().state());
+  EXPECT_EQ(TASK_KILLED, status->state());
 
   Clock::pause();
 
@@ -2286,7 +2286,7 @@ TYPED_TEST(SlaveRecoveryTest, Reboot)
   driver.start();
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
 
   TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
 
@@ -2308,9 +2308,9 @@ TYPED_TEST(SlaveRecoveryTest, Reboot)
   AWAIT_READY(registerExecutorMessage);
 
   RegisterExecutorMessage registerExecutor;
-  registerExecutor.ParseFromString(registerExecutorMessage.get().body);
+  registerExecutor.ParseFromString(registerExecutorMessage->body);
   ExecutorID executorId = registerExecutor.executor_id();
-  UPID executorPid = registerExecutorMessage.get().from;
+  UPID executorPid = registerExecutorMessage->from;
 
   // Wait for TASK_RUNNING update.
   AWAIT_READY(runningStatus);
@@ -2319,9 +2319,9 @@ TYPED_TEST(SlaveRecoveryTest, Reboot)
   Future<hashset<ContainerID>> containers = containerizer->containers();
 
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
-  ContainerID containerId = *containers.get().begin();
+  ContainerID containerId = *containers->begin();
 
   slave.get()->terminate();
 
@@ -2370,7 +2370,7 @@ TYPED_TEST(SlaveRecoveryTest, Reboot)
 
   AWAIT_READY(slaveRegistered);
 
-  SlaveID slaveId2 = slaveRegistered.get().slave_id();
+  SlaveID slaveId2 = slaveRegistered->slave_id();
 
   EXPECT_NE(slaveId1, slaveId2);
 
@@ -2433,7 +2433,7 @@ TYPED_TEST(SlaveRecoveryTest, GCExecutor)
   driver.start();
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
 
   TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
 
@@ -2570,7 +2570,7 @@ TYPED_TEST(SlaveRecoveryTest, ShutdownSlave)
 
   AWAIT_READY(offers1);
 
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
 
   TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
 
@@ -2586,7 +2586,7 @@ TYPED_TEST(SlaveRecoveryTest, ShutdownSlave)
 
   // Capture the executor pid.
   AWAIT_READY(registerExecutor);
-  UPID executorPid = registerExecutor.get().from;
+  UPID executorPid = registerExecutor->from;
 
   AWAIT_READY(statusUpdate1); // Wait for TASK_RUNNING update.
 
@@ -2635,7 +2635,7 @@ TYPED_TEST(SlaveRecoveryTest, ShutdownSlave)
   // Ensure that the slave registered with a new id.
   AWAIT_READY(offers3);
 
-  EXPECT_NE(0u, offers3.get().size());
+  EXPECT_NE(0u, offers3->size());
   // Make sure all slave resources are reoffered.
   EXPECT_EQ(Resources(offers1.get()[0].resources()),
             Resources(offers3.get()[0].resources()));
@@ -2688,7 +2688,7 @@ TYPED_TEST(SlaveRecoveryTest, ShutdownSlaveSIGUSR1)
 
   AWAIT_READY(offers);
 
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(offers.get()[0], "sleep 1000");
 
@@ -2699,7 +2699,7 @@ TYPED_TEST(SlaveRecoveryTest, ShutdownSlaveSIGUSR1)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   Future<TaskStatus> status2;
   EXPECT_CALL(sched, statusUpdate(_, _))
@@ -2731,9 +2731,9 @@ TYPED_TEST(SlaveRecoveryTest, ShutdownSlaveSIGUSR1)
   // The master should send a TASK_LOST and slaveLost.
   AWAIT_READY(status2);
 
-  EXPECT_EQ(TASK_LOST, status2.get().state());
-  EXPECT_EQ(TaskStatus::SOURCE_MASTER, status2.get().source());
-  EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, status2.get().reason());
+  EXPECT_EQ(TASK_LOST, status2->state());
+  EXPECT_EQ(TaskStatus::SOURCE_MASTER, status2->source());
+  EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, status2->reason());
 
   AWAIT_READY(slaveLost);
 
@@ -2913,7 +2913,7 @@ TYPED_TEST(SlaveRecoveryTest, ReconcileKillTask)
   driver.start();
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
 
   TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
 
@@ -2957,7 +2957,7 @@ TYPED_TEST(SlaveRecoveryTest, ReconcileKillTask)
 
   // Scheduler should get a TASK_KILLED message.
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_KILLED, status.get().state());
+  EXPECT_EQ(TASK_KILLED, status->state());
 
   // Make sure all slave resources are reoffered.
   AWAIT_READY(offers2);
@@ -3014,7 +3014,7 @@ TYPED_TEST(SlaveRecoveryTest, ReconcileShutdownFramework)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Capture the framework id.
   FrameworkID frameworkId = offers.get()[0].framework_id();
@@ -3160,7 +3160,7 @@ TYPED_TEST(SlaveRecoveryTest, ReconcileTasksMissingFromSlave)
   driver.start();
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
 
   // 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
@@ -3194,11 +3194,11 @@ TYPED_TEST(SlaveRecoveryTest, ReconcileTasksMissingFromSlave)
     slave::state::recover(slave::paths::getMetaRootDir(flags.work_dir), true);
 
   ASSERT_SOME(state);
-  ASSERT_SOME(state.get().slave);
-  ASSERT_TRUE(state.get().slave.get().frameworks.contains(frameworkId.get()));
+  ASSERT_SOME(state->slave);
+  ASSERT_TRUE(state->slave->frameworks.contains(frameworkId.get()));
 
   slave::state::FrameworkState frameworkState =
-    state.get().slave.get().frameworks.get(frameworkId.get()).get();
+    state->slave->frameworks.get(frameworkId.get()).get();
 
   ASSERT_EQ(1u, frameworkState.executors.size());
 
@@ -3251,10 +3251,10 @@ TYPED_TEST(SlaveRecoveryTest, ReconcileTasksMissingFromSlave)
   // Wait for TASK_DROPPED update.
   AWAIT_READY(status);
 
-  EXPECT_EQ(task.task_id(), status.get().task_id());
-  EXPECT_EQ(TASK_DROPPED, status.get().state());
-  EXPECT_EQ(TaskStatus::SOURCE_SLAVE, status.get().source());
-  EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, status.get().reason());
+  EXPECT_EQ(task.task_id(), status->task_id());
+  EXPECT_EQ(TASK_DROPPED, status->state());
+  EXPECT_EQ(TaskStatus::SOURCE_SLAVE, status->source());
+  EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, status->reason());
 
   Clock::pause();
 
@@ -3325,7 +3325,7 @@ TYPED_TEST(SlaveRecoveryTest, SchedulerFailover)
 
   AWAIT_READY(frameworkId);
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
 
   // Create a long running task.
   TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
@@ -3406,7 +3406,7 @@ TYPED_TEST(SlaveRecoveryTest, SchedulerFailover)
 
   // Wait for TASK_KILLED update.
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_KILLED, status.get().state());
+  EXPECT_EQ(TASK_KILLED, status->state());
 
   Clock::pause();
 
@@ -3477,7 +3477,7 @@ TYPED_TEST(SlaveRecoveryTest, MasterFailover)
 
   AWAIT_READY(frameworkRegisteredMessage);
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
 
   TaskInfo task = createTask(offers1.get()[0], "sleep 1000");
 
@@ -3557,7 +3557,7 @@ TYPED_TEST(SlaveRecoveryTest, MasterFailover)
 
   // Wait for TASK_KILLED update.
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_KILLED, status.get().state());
+  EXPECT_EQ(TASK_KILLED, status->state());
 
   // Make sure all slave resources are reoffered.
   AWAIT_READY(offers2);
@@ -3612,7 +3612,7 @@ TYPED_TEST(SlaveRecoveryTest, MultipleFrameworks)
   driver1.start();
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
 
   // Use part of the resources in the offer so that the rest can be
   // offered to framework 2.
@@ -3651,7 +3651,7 @@ TYPED_TEST(SlaveRecoveryTest, MultipleFrameworks)
   driver2.start();
 
   AWAIT_READY(offers2);
-  EXPECT_NE(0u, offers2.get().size());
+  EXPECT_NE(0u, offers2->size());
 
   // Framework 2 launches a task.
   TaskInfo task2 = createTask(offers2.get()[0], "sleep 1000");
@@ -3720,14 +3720,14 @@ TYPED_TEST(SlaveRecoveryTest, MultipleFrameworks)
 
   // Wait for TASK_KILLED update.
   AWAIT_READY(status1);
-  EXPECT_EQ(TASK_KILLED, status1.get().state());
+  EXPECT_EQ(TASK_KILLED, status1->state());
 
   // Kill task 2.
   driver2.killTask(task2.task_id());
 
   // Wait for TASK_KILLED update.
   AWAIT_READY(status2);
-  EXPECT_EQ(TASK_KILLED, status2.get().state());
+  EXPECT_EQ(TASK_KILLED, status2->state());
 
   AWAIT_READY(executorTerminated1);
   AWAIT_READY(executorTerminated2);
@@ -3904,10 +3904,10 @@ TYPED_TEST(SlaveRecoveryTest, MultipleSlaves)
   driver.killTask(task2.task_id());
 
   AWAIT_READY(status1);
-  EXPECT_EQ(TASK_KILLED, status1.get().state());
+  EXPECT_EQ(TASK_KILLED, status1->state());
 
   AWAIT_READY(status2);
-  EXPECT_EQ(TASK_KILLED, status2.get().state());
+  EXPECT_EQ(TASK_KILLED, status2->state());
 
   AWAIT_READY(executorTerminated1);
   AWAIT_READY(executorTerminated2);
@@ -3955,7 +3955,7 @@ TYPED_TEST(SlaveRecoveryTest, RestartBeforeContainerizerLaunch)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(offers.get()[0], "sleep 1000");
 
@@ -4057,7 +4057,7 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, ResourceStatistics)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(offers.get()[0], "sleep 1000");
 
@@ -4089,16 +4089,16 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, ResourceStatistics)
 
   Future<hashset<ContainerID>> containers = containerizer->containers();
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
-  ContainerID containerId = *(containers.get().begin());
+  ContainerID containerId = *(containers->begin());
 
   Future<ResourceStatistics> usage = containerizer->usage(containerId);
   AWAIT_READY(usage);
 
   // Check the resource limits are set.
-  EXPECT_TRUE(usage.get().has_cpus_limit());
-  EXPECT_TRUE(usage.get().has_mem_limit_bytes());
+  EXPECT_TRUE(usage->has_cpus_limit());
+  EXPECT_TRUE(usage->has_mem_limit_bytes());
 
   Future<Option<ContainerTermination>> wait =
     containerizer->wait(containerId);
@@ -4163,7 +4163,7 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PidNamespaceForward)
   driver.start();
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
 
   SlaveID slaveId = offers1.get()[0].slave_id();
 
@@ -4180,9 +4180,9 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PidNamespaceForward)
 
   Future<hashset<ContainerID>> containers = containerizer->containers();
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
-  ContainerID containerId = *(containers.get().begin());
+  ContainerID containerId = *(containers->begin());
 
   // Stop the slave.
   slave.get()->terminate();
@@ -4203,7 +4203,7 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PidNamespaceForward)
   ASSERT_SOME(slave);
 
   AWAIT_READY(offers2);
-  EXPECT_NE(0u, offers2.get().size());
+  EXPECT_NE(0u, offers2->size());
 
   // Set up to wait on the container's termination.
   Future<Option<ContainerTermination>> termination =
@@ -4268,7 +4268,7 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PidNamespaceBackward)
   driver.start();
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
 
   SlaveID slaveId = offers1.get()[0].slave_id();
 
@@ -4285,9 +4285,9 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PidNamespaceBackward)
 
   Future<hashset<ContainerID>> containers = containerizer->containers();
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
-  ContainerID containerId = *(containers.get().begin());
+  ContainerID containerId = *(containers->begin());
 
   // Stop the slave.
   slave.get()->terminate();
@@ -4309,7 +4309,7 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PidNamespaceBackward)
   ASSERT_SOME(slave);
 
   AWAIT_READY(offers2);
-  EXPECT_NE(0u, offers2.get().size());
+  EXPECT_NE(0u, offers2->size());
 
   // Set up to wait on the container's termination.
   Future<Option<ContainerTermination>> termination =

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index 61f4f42..c31c670 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -156,7 +156,7 @@ TEST_F(SlaveTest, Shutdown)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_EQ(1u, offers.get().size());
+  EXPECT_EQ(1u, offers->size());
 
   Future<Nothing> offerRescinded;
   EXPECT_CALL(sched, offerRescinded(&driver, offers.get()[0].id()))
@@ -342,7 +342,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, ShutdownUnregisteredExecutor)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Launch a task with the command executor.
   TaskInfo task;
@@ -458,7 +458,7 @@ TEST_F(SlaveTest, ExecutorTimeoutCausedBySlowFetch)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Launch a task with the command executor.
   // The task uses a URI that needs to be fetched by the HDFS client
@@ -557,7 +557,7 @@ TEST_F(SlaveTest, RemoveUnregisteredTerminatedExecutor)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("");
@@ -643,7 +643,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, CommandTaskWithArguments)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Launch a task with the command executor.
   TaskInfo task;
@@ -672,12 +672,12 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, CommandTaskWithArguments)
   // Scheduler should first receive TASK_RUNNING followed by the
   // TASK_FINISHED from the executor.
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
-  EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, statusRunning.get().source());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
+  EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, statusRunning->source());
 
   AWAIT_READY(statusFinished);
-  EXPECT_EQ(TASK_FINISHED, statusFinished.get().state());
-  EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, statusFinished.get().source());
+  EXPECT_EQ(TASK_FINISHED, statusFinished->state());
+  EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, statusFinished->source());
 
   driver.stop();
   driver.join();
@@ -1010,7 +1010,7 @@ TEST_F(SlaveTest, ROOT_RunTaskWithCommandInfoWithoutUser)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Launch a task with the command executor.
   TaskInfo task;
@@ -1046,12 +1046,12 @@ TEST_F(SlaveTest, ROOT_RunTaskWithCommandInfoWithoutUser)
   // Scheduler should first receive TASK_RUNNING followed by the
   // TASK_FINISHED from the executor.
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
-  EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, statusRunning.get().source());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
+  EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, statusRunning->source());
 
   AWAIT_READY(statusFinished);
-  EXPECT_EQ(TASK_FINISHED, statusFinished.get().state());
-  EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, statusFinished.get().source());
+  EXPECT_EQ(TASK_FINISHED, statusFinished->state());
+  EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, statusFinished->source());
 
   driver.stop();
   driver.join();
@@ -1114,7 +1114,7 @@ TEST_F(SlaveTest, DISABLED_ROOT_RunTaskWithCommandInfoWithUser)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // HACK: Launch a prepare task as root to prepare the binaries.
   // This task creates the lt-mesos-executor binary in the build dir.
@@ -1153,12 +1153,12 @@ TEST_F(SlaveTest, DISABLED_ROOT_RunTaskWithCommandInfoWithUser)
   // Scheduler should first receive TASK_RUNNING followed by the
   // TASK_FINISHED from the executor.
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
-  EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, statusRunning.get().source());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
+  EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, statusRunning->source());
 
   AWAIT_READY(statusFinished);
-  EXPECT_EQ(TASK_FINISHED, statusFinished.get().state());
-  EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, statusFinished.get().source());
+  EXPECT_EQ(TASK_FINISHED, statusFinished->state());
+  EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, statusFinished->source());
 
   // Start to launch a task with different user.
   EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -1166,7 +1166,7 @@ TEST_F(SlaveTest, DISABLED_ROOT_RunTaskWithCommandInfoWithUser)
     .WillRepeatedly(Return()); // Ignore subsequent offers.
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Launch a task with the command executor.
   TaskInfo task;
@@ -1194,12 +1194,12 @@ TEST_F(SlaveTest, DISABLED_ROOT_RunTaskWithCommandInfoWithUser)
   // Scheduler should first receive TASK_RUNNING followed by the
   // TASK_FINISHED from the executor.
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
-  EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, statusRunning.get().source());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
+  EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, statusRunning->source());
 
   AWAIT_READY(statusFinished);
-  EXPECT_EQ(TASK_FINISHED, statusFinished.get().state());
-  EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, statusFinished.get().source());
+  EXPECT_EQ(TASK_FINISHED, statusFinished->state());
+  EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, statusFinished->source());
 
   driver.stop();
   driver.join();
@@ -1239,10 +1239,10 @@ TEST_F(SlaveTest, IgnoreNonLeaderStatusUpdateAcknowledgement)
   schedDriver.start();
 
   AWAIT_READY(frameworkRegisteredMessage);
-  const UPID schedulerPid = frameworkRegisteredMessage.get().to;
+  const UPID schedulerPid = frameworkRegisteredMessage->to;
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(offers.get()[0], "", DEFAULT_EXECUTOR_ID);
 
@@ -1271,7 +1271,7 @@ TEST_F(SlaveTest, IgnoreNonLeaderStatusUpdateAcknowledgement)
   schedDriver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(update);
-  EXPECT_EQ(TASK_RUNNING, update.get().state());
+  EXPECT_EQ(TASK_RUNNING, update->state());
 
   AWAIT_READY(acknowledgementMessage);
 
@@ -1402,7 +1402,7 @@ TEST_F(SlaveTest, MetricsSlaveLaunchErrors)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
   const Offer offer = offers.get()[0];
 
   // Verify that we start with no launch failures.
@@ -1429,7 +1429,7 @@ TEST_F(SlaveTest, MetricsSlaveLaunchErrors)
   driver.launchTasks(offer.id(), {task});
 
   AWAIT_READY(failureUpdate);
-  ASSERT_EQ(TASK_FAILED, failureUpdate.get().state());
+  ASSERT_EQ(TASK_FAILED, failureUpdate->state());
 
   // After failure injection, metrics should report a single failure.
   snapshot = Metrics();
@@ -1479,7 +1479,7 @@ TEST_F(SlaveTest, StateEndpoint)
   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);
 
@@ -1579,7 +1579,7 @@ TEST_F(SlaveTest, StateEndpoint)
   Clock::advance(masterFlags.allocation_interval);
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   Resources executorResources = Resources::parse("cpus:0.1;mem:32").get();
   executorResources.allocate("*");
@@ -1609,7 +1609,7 @@ TEST_F(SlaveTest, StateEndpoint)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   response = process::http::get(
       slave.get()->pid,
@@ -1620,7 +1620,7 @@ TEST_F(SlaveTest, StateEndpoint)
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
   AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response);
 
-  parse = JSON::parse<JSON::Object>(response.get().body);
+  parse = JSON::parse<JSON::Object>(response->body);
   ASSERT_SOME(parse);
 
   state = parse.get();
@@ -1652,9 +1652,9 @@ TEST_F(SlaveTest, StateEndpoint)
 
   Result<JSON::Array> tasks = executor.find<JSON::Array>("tasks");
   ASSERT_SOME(tasks);
-  EXPECT_EQ(1u, tasks.get().values.size());
+  EXPECT_EQ(1u, tasks->values.size());
 
-  JSON::Object taskJSON = tasks.get().values[0].as<JSON::Object>();
+  JSON::Object taskJSON = tasks->values[0].as<JSON::Object>();
   EXPECT_EQ("default", taskJSON.values["executor_id"]);
   EXPECT_EQ("", taskJSON.values["name"]);
   EXPECT_EQ(taskId.value(), taskJSON.values["id"]);
@@ -1720,7 +1720,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
   driver.start();
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   // Need this expectation here because `TestContainerizer` doesn't do recovery
   // and hence sets `MESOS_RECOVERY_TIMEOUT` as '0s' causing the executor driver
@@ -1905,7 +1905,7 @@ TEST_F(SlaveTest, StatisticsEndpointMissingStatistics)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -1925,7 +1925,7 @@ TEST_F(SlaveTest, StatisticsEndpointMissingStatistics)
   driver.launchTasks(offer.id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   // Set up the containerizer so the next usage() will fail.
   EXPECT_CALL(containerizer, usage(_))
@@ -2011,7 +2011,7 @@ TEST_F(SlaveTest, StatisticsEndpointRunningExecutor)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_FALSE(offers.get().empty());
+  EXPECT_FALSE(offers->empty());
 
   const Offer& offer = offers.get()[0];
 
@@ -2028,8 +2028,8 @@ TEST_F(SlaveTest, StatisticsEndpointRunningExecutor)
   driver.launchTasks(offer.id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(task.task_id(), status.get().task_id());
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(task.task_id(), status->task_id());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   // Hit the statistics endpoint and expect the response contains the
   // resource statistics for the running container.
@@ -2044,7 +2044,7 @@ TEST_F(SlaveTest, StatisticsEndpointRunningExecutor)
 
   // Verify that the statistics in the response contains the proper
   // resource limits for the container.
-  Try<JSON::Value> value = JSON::parse(response.get().body);
+  Try<JSON::Value> value = JSON::parse(response->body);
   ASSERT_SOME(value);
 
   Try<JSON::Value> expected = JSON::parse(strings::format(
@@ -2058,7 +2058,7 @@ TEST_F(SlaveTest, StatisticsEndpointRunningExecutor)
       (Megabytes(32) + slave::DEFAULT_EXECUTOR_MEM).bytes()).get());
 
   ASSERT_SOME(expected);
-  EXPECT_TRUE(value.get().contains(expected.get()));
+  EXPECT_TRUE(value->contains(expected.get()));
 
   driver.stop();
   driver.join();
@@ -2089,7 +2089,7 @@ TEST_F(SlaveTest, StatisticsEndpointAuthentication)
           statisticsEndpoint);
 
       AWAIT_EXPECT_RESPONSE_STATUS_EQ(Unauthorized({}).status, response)
-          << response.get().body;
+          << response->body;
     }
 
     // Incorrectly authenticated requests are rejected.
@@ -2105,7 +2105,7 @@ TEST_F(SlaveTest, StatisticsEndpointAuthentication)
           createBasicAuthHeaders(badCredential));
 
       AWAIT_EXPECT_RESPONSE_STATUS_EQ(Unauthorized({}).status, response)
-          << response.get().body;
+          << response->body;
     }
 
     // Correctly authenticated requests succeed.
@@ -2117,7 +2117,7 @@ TEST_F(SlaveTest, StatisticsEndpointAuthentication)
           createBasicAuthHeaders(DEFAULT_CREDENTIAL));
 
       AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-          << response.get().body;
+          << response->body;
     }
   }
 }
@@ -2178,7 +2178,7 @@ TEST_F(SlaveTest, ContainersEndpoint)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -2198,7 +2198,7 @@ TEST_F(SlaveTest, ContainersEndpoint)
   driver.launchTasks(offer.id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   ResourceStatistics statistics;
   statistics.set_mem_limit_bytes(2048);
@@ -2236,7 +2236,7 @@ TEST_F(SlaveTest, ContainersEndpoint)
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
   AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response);
 
-  Try<JSON::Value> value = JSON::parse(response.get().body);
+  Try<JSON::Value> value = JSON::parse(response->body);
   ASSERT_SOME(value);
 
   Try<JSON::Value> expected = JSON::parse(
@@ -2260,7 +2260,7 @@ TEST_F(SlaveTest, ContainersEndpoint)
       "}]");
 
   ASSERT_SOME(expected);
-  EXPECT_TRUE(value.get().contains(expected.get()));
+  EXPECT_TRUE(value->contains(expected.get()));
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -2328,7 +2328,7 @@ TEST_F(SlaveTest, DISABLED_TerminatingSlaveDoesNotReregister)
   driver.start();
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   // Pause the clock here so that after detecting a new master,
   // the slave will not send multiple reregister messages
@@ -2416,7 +2416,7 @@ TEST_F(SlaveTest, TerminalTaskContainerizerUpdateFailsWithLost)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
   Offer offer = offers.get()[0];
 
   // Start two tasks.
@@ -2448,10 +2448,10 @@ TEST_F(SlaveTest, TerminalTaskContainerizerUpdateFailsWithLost)
   driver.launchTasks(offer.id(), tasks);
 
   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());
 
   // Set up the containerizer so the next update() will fail.
   EXPECT_CALL(containerizer, update(_, _))
@@ -2470,8 +2470,8 @@ TEST_F(SlaveTest, TerminalTaskContainerizerUpdateFailsWithLost)
   driver.killTask(tasks[0].task_id());
 
   AWAIT_READY(status3);
-  EXPECT_EQ(TASK_KILLED, status3.get().state());
-  EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, status3.get().source());
+  EXPECT_EQ(TASK_KILLED, status3->state());
+  EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, status3->source());
 
   AWAIT_READY(status4);
   EXPECT_EQ(TASK_LOST, status4->state());
@@ -2529,7 +2529,7 @@ TEST_F(SlaveTest, TerminalTaskContainerizerUpdateFailsWithGone)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
   Offer offer = offers.get()[0];
 
   // Start two tasks.
@@ -2561,10 +2561,10 @@ TEST_F(SlaveTest, TerminalTaskContainerizerUpdateFailsWithGone)
   driver.launchTasks(offer.id(), tasks);
 
   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());
 
   // Set up the containerizer so the next update() will fail.
   EXPECT_CALL(containerizer, update(_, _))
@@ -2583,8 +2583,8 @@ TEST_F(SlaveTest, TerminalTaskContainerizerUpdateFailsWithGone)
   driver.killTask(tasks[0].task_id());
 
   AWAIT_READY(status3);
-  EXPECT_EQ(TASK_KILLED, status3.get().state());
-  EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, status3.get().source());
+  EXPECT_EQ(TASK_KILLED, status3->state());
+  EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, status3->source());
 
   AWAIT_READY(status4);
   EXPECT_EQ(TASK_GONE, status4->state());
@@ -2651,7 +2651,7 @@ TEST_F(SlaveTest, ContainerUpdatedBeforeTaskReachesExecutor)
   driver.start();
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -2744,8 +2744,8 @@ TEST_F(SlaveTest, PingTimeoutNoPings)
   ASSERT_SOME(slave);
 
   AWAIT_READY(slaveRegisteredMessage);
-  ASSERT_TRUE(slaveRegisteredMessage.get().has_connection());
-  MasterSlaveConnection connection = slaveRegisteredMessage.get().connection();
+  ASSERT_TRUE(slaveRegisteredMessage->has_connection());
+  MasterSlaveConnection connection = slaveRegisteredMessage->connection();
   EXPECT_EQ(totalTimeout, Seconds(connection.total_ping_timeout_seconds()));
 
   // Ensure the slave processes the registration message and schedules
@@ -3159,7 +3159,7 @@ TEST_F(SlaveTest, UnreachableThenUnregisterRace)
   EXPECT_NE(
       nullptr,
       dynamic_cast<master::MarkSlaveUnreachable*>(
-          markUnreachable.get().get()));
+          markUnreachable->get()));
 
   // Cause the slave to shutdown gracefully.  This should result in
   // the slave sending `UnregisterSlaveMessage` to the master.
@@ -3236,7 +3236,7 @@ TEST_F(SlaveTest, UnregisterThenUnreachableRace)
   // master. Waiting for resource offers should accomplish both.
   AWAIT_READY(resourceOffers);
 
-  ASSERT_EQ(1u, resourceOffers.get().size());
+  ASSERT_EQ(1u, resourceOffers->size());
   SlaveID slaveId = resourceOffers.get()[0].slave_id();
 
   Clock::pause();
@@ -3264,7 +3264,7 @@ TEST_F(SlaveTest, UnregisterThenUnreachableRace)
   AWAIT_READY(removeSlave);
   EXPECT_NE(
       nullptr,
-      dynamic_cast<master::RemoveSlave*>(removeSlave.get().get()));
+      dynamic_cast<master::RemoveSlave*>(removeSlave->get()));
 
   // Next, cause the slave to fail health checks; master will attempt
   // to mark it unreachable.
@@ -3350,7 +3350,7 @@ TEST_F(SlaveTest, KillTaskBetweenRunTaskParts)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("");
@@ -3420,7 +3420,7 @@ TEST_F(SlaveTest, KillTaskBetweenRunTaskParts)
   AWAIT_READY(removeFramework);
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_KILLED, status.get().state());
+  EXPECT_EQ(TASK_KILLED, status->state());
 
   driver.stop();
   driver.join();
@@ -3461,7 +3461,7 @@ TEST_F(SlaveTest, KillTaskUnregisteredExecutor)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("");
@@ -3735,7 +3735,7 @@ TEST_F(SlaveTest, ReregisterWithStatusUpdateTaskState)
 
   // Now send TASK_FINISHED update.
   TaskStatus finishedStatus;
-  finishedStatus = statusUpdateMessage.get().update().status();
+  finishedStatus = statusUpdateMessage->update().status();
   finishedStatus.set_state(TASK_FINISHED);
   execDriver->sendStatusUpdate(finishedStatus);
 
@@ -3760,18 +3760,18 @@ TEST_F(SlaveTest, ReregisterWithStatusUpdateTaskState)
   Clock::advance(agentFlags.registration_backoff_factor);
   AWAIT_READY(reregisterSlaveMessage);
 
-  ASSERT_EQ(1, reregisterSlaveMessage.get().tasks_size());
+  ASSERT_EQ(1, reregisterSlaveMessage->tasks_size());
 
   // The latest state of the task should be TASK_FINISHED.
-  ASSERT_EQ(TASK_FINISHED, reregisterSlaveMessage.get().tasks(0).state());
+  ASSERT_EQ(TASK_FINISHED, reregisterSlaveMessage->tasks(0).state());
 
   // The status update state of the task should be TASK_RUNNING.
   ASSERT_EQ(TASK_RUNNING,
-            reregisterSlaveMessage.get().tasks(0).status_update_state());
+            reregisterSlaveMessage->tasks(0).status_update_state());
 
   // The status update uuid should match the TASK_RUNNING's uuid.
-  ASSERT_EQ(statusUpdateMessage.get().update().uuid(),
-            reregisterSlaveMessage.get().tasks(0).status_update_uuid());
+  ASSERT_EQ(statusUpdateMessage->update().uuid(),
+            reregisterSlaveMessage->tasks(0).status_update_uuid());
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -3812,7 +3812,7 @@ TEST_F(SlaveTest, ContainerizerUsageFailure)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -3832,7 +3832,7 @@ TEST_F(SlaveTest, ContainerizerUsageFailure)
   driver.launchTasks(offer.id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   // Set up the containerizer so the next usage() will fail.
   EXPECT_CALL(containerizer, usage(_))
@@ -3843,8 +3843,8 @@ TEST_F(SlaveTest, ContainerizerUsageFailure)
   Future<ResourceUsage> usage = slave.usage();
 
   AWAIT_READY(usage);
-  ASSERT_EQ(1, usage.get().executors_size());
-  EXPECT_FALSE(usage.get().executors(0).has_statistics());
+  ASSERT_EQ(1, usage->executors_size());
+  EXPECT_FALSE(usage->executors(0).has_statistics());
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -3890,7 +3890,7 @@ TEST_F(SlaveTest, DiscoveryInfoAndPorts)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(
       offers.get()[0],
@@ -3939,10 +3939,10 @@ TEST_F(SlaveTest, DiscoveryInfoAndPorts)
   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);
 
-  Result<JSON::Object> discoveryResult = parse.get().find<JSON::Object>(
+  Result<JSON::Object> discoveryResult = parse->find<JSON::Object>(
       "frameworks[0].executors[0].tasks[0].discovery");
   EXPECT_SOME(discoveryResult);
 
@@ -4091,7 +4091,7 @@ TEST_F(SlaveTest, TaskLabels)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("");
@@ -4125,7 +4125,7 @@ TEST_F(SlaveTest, TaskLabels)
   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(update);
 
@@ -4139,10 +4139,10 @@ TEST_F(SlaveTest, TaskLabels)
   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);
 
-  Result<JSON::Array> find = parse.get().find<JSON::Array>(
+  Result<JSON::Array> find = parse->find<JSON::Array>(
       "frameworks[0].executors[0].tasks[0].labels");
   EXPECT_SOME(find);
 
@@ -4195,7 +4195,7 @@ TEST_F(SlaveTest, TaskStatusLabels)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(
       offers.get()[0],
@@ -4220,7 +4220,7 @@ TEST_F(SlaveTest, TaskStatusLabels)
 
   // Now send TASK_RUNNING update.
   TaskStatus runningStatus;
-  runningStatus.mutable_task_id()->MergeFrom(execTask.get().task_id());
+  runningStatus.mutable_task_id()->MergeFrom(execTask->task_id());
   runningStatus.set_state(TASK_RUNNING);
 
   // Add three labels to the task (two of which share the same key).
@@ -4244,10 +4244,10 @@ TEST_F(SlaveTest, TaskStatusLabels)
   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);
 
-  Result<JSON::Array> find = parse.get().find<JSON::Array>(
+  Result<JSON::Array> find = parse->find<JSON::Array>(
       "frameworks[0].executors[0].tasks[0].statuses[0].labels");
   EXPECT_SOME(find);
 
@@ -4300,7 +4300,7 @@ TEST_F(SlaveTest, TaskStatusContainerStatus)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(
       offers.get()[0],
@@ -4324,12 +4324,12 @@ TEST_F(SlaveTest, TaskStatusContainerStatus)
 
   // Validate that the Slave has passed in its IP address in
   // TaskStatus.container_status.network_infos[0].ip_address.
-  EXPECT_TRUE(status.get().has_container_status());
-  EXPECT_EQ(1, status.get().container_status().network_infos().size());
-  EXPECT_EQ(1, status.get().container_status().network_infos(0).ip_addresses().size()); // NOLINT(whitespace/line_length)
+  EXPECT_TRUE(status->has_container_status());
+  EXPECT_EQ(1, status->container_status().network_infos().size());
+  EXPECT_EQ(1, status->container_status().network_infos(0).ip_addresses().size()); // NOLINT(whitespace/line_length)
 
   NetworkInfo::IPAddress ipAddress =
-    status.get().container_status().network_infos(0).ip_addresses(0);
+    status->container_status().network_infos(0).ip_addresses(0);
 
   ASSERT_TRUE(ipAddress.has_ip_address());
   EXPECT_EQ(slaveIPAddress, ipAddress.ip_address());
@@ -4344,14 +4344,14 @@ TEST_F(SlaveTest, TaskStatusContainerStatus)
   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);
 
   // Validate that the IP address passed in by the Slave is available at the
   // state endpoint.
   ASSERT_SOME_EQ(
       slaveIPAddress,
-      parse.get().find<JSON::String>(
+      parse->find<JSON::String>(
           "frameworks[0].executors[0].tasks[0].statuses[0]"
           ".container_status.network_infos[0]"
           ".ip_addresses[0].ip_address"));
@@ -4398,7 +4398,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, ExecutorEnvironmentVariables)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Launch a task with the command executor.
   TaskInfo task;
@@ -4425,10 +4425,10 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, ExecutorEnvironmentVariables)
   // Scheduler should first receive TASK_RUNNING followed by the
   // TASK_FINISHED from the executor.
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusFinished);
-  EXPECT_EQ(TASK_FINISHED, statusFinished.get().state());
+  EXPECT_EQ(TASK_FINISHED, statusFinished->state());
 
   driver.stop();
   driver.join();
@@ -4463,7 +4463,7 @@ TEST_F(SlaveTest, TotalSlaveResourcesIncludedInUsage)
   AWAIT_READY(usage);
 
   // Total resources should match the resources from flag.resources.
-  EXPECT_EQ(Resources(usage.get().total()),
+  EXPECT_EQ(Resources(usage->total()),
             Resources::parse(flags.resources.get()).get());
 
   terminate(slave);
@@ -4515,7 +4515,7 @@ TEST_F(SlaveTest, CheckpointedResourcesIncludedInUsage)
 
   AWAIT_READY(usage);
 
-  Resources usageTotalResources(usage.get().total());
+  Resources usageTotalResources(usage->total());
 
   // Reported total field should contain persistent volumes and dynamic
   // reservations.
@@ -4736,7 +4736,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, HTTPSchedulerSlaveRestart)
     FUTURE_MESSAGE(Eq(RegisterExecutorMessage().GetTypeName()), _, _);
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   SlaveID slaveId = offers.get()[0].slave_id();
 
@@ -4765,12 +4765,12 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, HTTPSchedulerSlaveRestart)
   AWAIT_READY(registerExecutorMessage);
 
   RegisterExecutorMessage registerExecutor;
-  registerExecutor.ParseFromString(registerExecutorMessage.get().body);
+  registerExecutor.ParseFromString(registerExecutorMessage->body);
   ExecutorID executorId = registerExecutor.executor_id();
-  UPID executorPid = registerExecutorMessage.get().from;
+  UPID executorPid = registerExecutorMessage->from;
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   // Restart the slave.
   slave.get()->terminate();

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/state_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/state_tests.cpp b/src/tests/state_tests.cpp
index d200768..7434473 100644
--- a/src/tests/state_tests.cpp
+++ b/src/tests/state_tests.cpp
@@ -136,7 +136,7 @@ void FetchAndStoreAndStoreAndFetch(State* state)
   AWAIT_READY(future2);
   ASSERT_SOME(future2.get());
 
-  variable = future2.get().get();
+  variable = future2->get();
 
   future2 = state->store(variable);
   AWAIT_READY(future2);
@@ -182,7 +182,7 @@ void FetchAndStoreAndStoreFailAndFetch(State* state)
 
   future2 = state->store(variable2);
   AWAIT_READY(future2);
-  EXPECT_TRUE(future2.get().isNone());
+  EXPECT_TRUE(future2->isNone());
 
   future1 = state->fetch<Slaves>("slaves");
   AWAIT_READY(future1);
@@ -214,7 +214,7 @@ void FetchAndStoreAndExpungeAndFetch(State* state)
   AWAIT_READY(future2);
   ASSERT_SOME(future2.get());
 
-  variable = future2.get().get();
+  variable = future2->get();
 
   Future<bool> future3 = state->expunge(variable);
   AWAIT_READY(future3);
@@ -249,7 +249,7 @@ void FetchAndStoreAndExpungeAndExpunge(State* state)
   AWAIT_READY(future2);
   ASSERT_SOME(future2.get());
 
-  variable = future2.get().get();
+  variable = future2->get();
 
   Future<bool> future3 = state->expunge(variable);
   AWAIT_READY(future3);
@@ -280,7 +280,7 @@ void FetchAndStoreAndExpungeAndStoreAndFetch(State* state)
   AWAIT_READY(future2);
   ASSERT_SOME(future2.get());
 
-  variable = future2.get().get();
+  variable = future2->get();
 
   Future<bool> future3 = state->expunge(variable);
   AWAIT_READY(future3);
@@ -322,8 +322,8 @@ void Names(State* state)
 
   Future<set<string>> names = state->names();
   AWAIT_READY(names);
-  ASSERT_EQ(1u, names.get().size());
-  EXPECT_NE(names.get().find("slaves"), names.get().end());
+  ASSERT_EQ(1u, names->size());
+  EXPECT_NE(names->find("slaves"), names->end());
 }
 
 
@@ -637,7 +637,7 @@ TEST_F(LogStateTest, Diff)
   AWAIT_READY(future2);
   ASSERT_SOME(future2.get());
 
-  variable = future2.get().get();
+  variable = future2->get();
 
   Slave* slave = slaves.add_slaves();
   slave->mutable_info()->set_hostname("localhost1024");

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/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 bfb471f..710723c 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_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   EXPECT_CALL(exec, registered(_, _, _, _));
 
@@ -143,7 +143,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(StatusUpdateManagerTest, CheckpointStatusUpdate)
   driver.launchTasks(offers.get()[0].id(), createTasks(offers.get()[0]));
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   AWAIT_READY(_statusUpdateAcknowledgement);
 
@@ -153,11 +153,11 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(StatusUpdateManagerTest, CheckpointStatusUpdate)
     slave::state::recover(slave::paths::getMetaRootDir(flags.work_dir), true);
 
   ASSERT_SOME(state);
-  ASSERT_SOME(state.get().slave);
-  ASSERT_TRUE(state.get().slave.get().frameworks.contains(frameworkId.get()));
+  ASSERT_SOME(state->slave);
+  ASSERT_TRUE(state->slave->frameworks.contains(frameworkId.get()));
 
   slave::state::FrameworkState frameworkState =
-    state.get().slave.get().frameworks.get(frameworkId.get()).get();
+    state->slave->frameworks.get(frameworkId.get()).get();
 
   ASSERT_EQ(1u, frameworkState.executors.size());
 
@@ -215,7 +215,7 @@ TEST_F(StatusUpdateManagerTest, RetryStatusUpdate)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   EXPECT_CALL(exec, registered(_, _, _, _));
 
@@ -239,7 +239,7 @@ TEST_F(StatusUpdateManagerTest, RetryStatusUpdate)
 
   AWAIT_READY(status);
 
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   Clock::resume();
 
@@ -286,7 +286,7 @@ TEST_F(StatusUpdateManagerTest, IgnoreDuplicateStatusUpdateAck)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   ExecutorDriver* execDriver;
   EXPECT_CALL(exec, registered(_, _, _, _))
@@ -305,7 +305,7 @@ TEST_F(StatusUpdateManagerTest, IgnoreDuplicateStatusUpdateAck)
   driver.launchTasks(offers.get()[0].id(), createTasks(offers.get()[0]));
 
   AWAIT_READY(statusUpdateMessage);
-  StatusUpdate update = statusUpdateMessage.get().update();
+  StatusUpdate update = statusUpdateMessage->update();
 
   Future<TaskStatus> status;
   EXPECT_CALL(sched, statusUpdate(_, _))
@@ -319,7 +319,7 @@ TEST_F(StatusUpdateManagerTest, IgnoreDuplicateStatusUpdateAck)
 
   AWAIT_READY(status);
 
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   AWAIT_READY(ack);
 
@@ -402,7 +402,7 @@ TEST_F(StatusUpdateManagerTest, IgnoreUnexpectedStatusUpdateAck)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   ExecutorDriver* execDriver;
   EXPECT_CALL(exec, registered(_, _, _, _))
@@ -424,11 +424,11 @@ TEST_F(StatusUpdateManagerTest, IgnoreUnexpectedStatusUpdateAck)
   driver.launchTasks(offers.get()[0].id(), createTasks(offers.get()[0]));
 
   AWAIT_READY(statusUpdateMessage);
-  StatusUpdate update = statusUpdateMessage.get().update();
+  StatusUpdate update = statusUpdateMessage->update();
 
   AWAIT_READY(status);
 
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   Future<Nothing> unexpectedAck =
       FUTURE_DISPATCH(_, &Slave::_statusUpdateAcknowledgement);
@@ -492,7 +492,7 @@ TEST_F(StatusUpdateManagerTest, DuplicateTerminalUpdateAfterAck)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   ExecutorDriver* execDriver;
   EXPECT_CALL(exec, registered(_, _, _, _))
@@ -513,7 +513,7 @@ TEST_F(StatusUpdateManagerTest, DuplicateTerminalUpdateAfterAck)
 
   AWAIT_READY(status);
 
-  EXPECT_EQ(TASK_FINISHED, status.get().state());
+  EXPECT_EQ(TASK_FINISHED, status->state());
 
   AWAIT_READY(_statusUpdateAcknowledgement);
 
@@ -533,7 +533,7 @@ TEST_F(StatusUpdateManagerTest, DuplicateTerminalUpdateAfterAck)
 
   // Ensure the scheduler receives TASK_KILLED.
   AWAIT_READY(update);
-  EXPECT_EQ(TASK_KILLED, update.get().state());
+  EXPECT_EQ(TASK_KILLED, update->state());
 
   // Ensure the slave properly handles the ACK.
   // Clock::settle() ensures that the slave successfully
@@ -587,7 +587,7 @@ TEST_F(StatusUpdateManagerTest, DuplicateUpdateBeforeAck)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   ExecutorDriver* execDriver;
   EXPECT_CALL(exec, registered(_, _, _, _))
@@ -616,7 +616,7 @@ TEST_F(StatusUpdateManagerTest, DuplicateUpdateBeforeAck)
 
   AWAIT_READY(status);
 
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   AWAIT_READY(statusUpdateAckMessage);
 
@@ -642,7 +642,7 @@ TEST_F(StatusUpdateManagerTest, DuplicateUpdateBeforeAck)
 
   // Ensure the scheduler receives TASK_FINISHED.
   AWAIT_READY(update);
-  EXPECT_EQ(TASK_RUNNING, update.get().state());
+  EXPECT_EQ(TASK_RUNNING, update->state());
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -707,7 +707,7 @@ TEST_F(StatusUpdateManagerTest, LatestTaskState)
 
   // Now send TASK_FINISHED update.
   TaskStatus finishedStatus;
-  finishedStatus = statusUpdateMessage.get().update().status();
+  finishedStatus = statusUpdateMessage->update().status();
   finishedStatus.set_state(TASK_FINISHED);
   execDriver->sendStatusUpdate(finishedStatus);
 
@@ -724,11 +724,11 @@ TEST_F(StatusUpdateManagerTest, LatestTaskState)
   AWAIT_READY(statusUpdateMessage2);
 
   // The update should correspond to TASK_RUNNING.
-  ASSERT_EQ(TASK_RUNNING, statusUpdateMessage2.get().update().status().state());
+  ASSERT_EQ(TASK_RUNNING, statusUpdateMessage2->update().status().state());
 
   // The update should include TASK_FINISHED as the latest state.
   ASSERT_EQ(TASK_FINISHED,
-            statusUpdateMessage2.get().update().latest_state());
+            statusUpdateMessage2->update().latest_state());
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -772,7 +772,7 @@ TEST_F(StatusUpdateManagerTest, DuplicatedTerminalStatusUpdate)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   ExecutorDriver* execDriver;
   EXPECT_CALL(exec, registered(_, _, _, _))
@@ -793,7 +793,7 @@ TEST_F(StatusUpdateManagerTest, DuplicatedTerminalStatusUpdate)
 
   AWAIT_READY(status);
 
-  EXPECT_EQ(TASK_FINISHED, status.get().state());
+  EXPECT_EQ(TASK_FINISHED, status->state());
 
   AWAIT_READY(_statusUpdateAcknowledgement);
 
@@ -813,7 +813,7 @@ TEST_F(StatusUpdateManagerTest, DuplicatedTerminalStatusUpdate)
 
   // Ensure the scheduler receives TASK_KILLED.
   AWAIT_READY(update);
-  EXPECT_EQ(TASK_KILLED, update.get().state());
+  EXPECT_EQ(TASK_KILLED, update->state());
 
   // Ensure the slave properly handles the ACK.
   // Clock::settle() ensures that the slave successfully
@@ -830,10 +830,10 @@ TEST_F(StatusUpdateManagerTest, DuplicatedTerminalStatusUpdate)
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(process::http::OK().status, tasks);
   AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", tasks);
 
-  Try<JSON::Object> parse = JSON::parse<JSON::Object>(tasks.get().body);
+  Try<JSON::Object> parse = JSON::parse<JSON::Object>(tasks->body);
   ASSERT_SOME(parse);
 
-  Result<JSON::String> state = parse.get().find<JSON::String>("tasks[0].state");
+  Result<JSON::String> state = parse->find<JSON::String>("tasks[0].state");
 
   ASSERT_SOME_EQ(JSON::String("TASK_FINISHED"), state);
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/upgrade_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/upgrade_tests.cpp b/src/tests/upgrade_tests.cpp
index baf16f8..b5a28b5 100644
--- a/src/tests/upgrade_tests.cpp
+++ b/src/tests/upgrade_tests.cpp
@@ -149,7 +149,7 @@ TEST_F(UpgradeTest, ReregisterOldAgentWithMultiRoleMaster)
     .Times(AtMost(1));
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   master->reset();
   master = StartMaster(masterFlags);

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/utils.cpp
----------------------------------------------------------------------
diff --git a/src/tests/utils.cpp b/src/tests/utils.cpp
index 0a9e5a8..bc5c8ab 100644
--- a/src/tests/utils.cpp
+++ b/src/tests/utils.cpp
@@ -62,7 +62,7 @@ JSON::Object Metrics()
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(http::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);
   CHECK_SOME(parse);
 
   return parse.get();

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/values_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/values_tests.cpp b/src/tests/values_tests.cpp
index cc17b67..843baf6 100644
--- a/src/tests/values_tests.cpp
+++ b/src/tests/values_tests.cpp
@@ -45,32 +45,32 @@ TEST(ValuesTest, ValidInput)
   // Test parsing scalar type.
   Try<Value> result1 = parse("45.55");
   ASSERT_SOME(result1);
-  ASSERT_EQ(Value::SCALAR, result1.get().type());
-  EXPECT_FLOAT_EQ(45.55, result1.get().scalar().value());
+  ASSERT_EQ(Value::SCALAR, result1->type());
+  EXPECT_FLOAT_EQ(45.55, result1->scalar().value());
 
   // Test parsing ranges type.
   Try<Value> result2 = parse("[10000-20000, 30000-50000]");
   ASSERT_SOME(result2);
-  ASSERT_EQ(Value::RANGES, result2.get().type());
-  EXPECT_EQ(2, result2.get().ranges().range_size());
-  EXPECT_EQ(10000u, result2.get().ranges().range(0).begin());
-  EXPECT_EQ(20000u, result2.get().ranges().range(0).end());
-  EXPECT_EQ(30000u, result2.get().ranges().range(1).begin());
-  EXPECT_EQ(50000u, result2.get().ranges().range(1).end());
+  ASSERT_EQ(Value::RANGES, result2->type());
+  EXPECT_EQ(2, result2->ranges().range_size());
+  EXPECT_EQ(10000u, result2->ranges().range(0).begin());
+  EXPECT_EQ(20000u, result2->ranges().range(0).end());
+  EXPECT_EQ(30000u, result2->ranges().range(1).begin());
+  EXPECT_EQ(50000u, result2->ranges().range(1).end());
 
   // Test parsing set type.
   Try<Value> result3 = parse("{sda1, sda2}");
   ASSERT_SOME(result3);
-  ASSERT_EQ(Value::SET, result3.get().type());
-  ASSERT_EQ(2, result3.get().set().item_size());
-  EXPECT_EQ("sda1", result3.get().set().item(0));
-  EXPECT_EQ("sda2", result3.get().set().item(1));
+  ASSERT_EQ(Value::SET, result3->type());
+  ASSERT_EQ(2, result3->set().item_size());
+  EXPECT_EQ("sda1", result3->set().item(0));
+  EXPECT_EQ("sda2", result3->set().item(1));
 
   // Test parsing text type.
   Try<Value> result4 = parse("123abc,s");
   ASSERT_SOME(result4);
-  ASSERT_EQ(Value::TEXT, result4.get().type());
-  ASSERT_EQ("123abc,s", result4.get().text().value());
+  ASSERT_EQ(Value::TEXT, result4->type());
+  ASSERT_EQ("123abc,s", result4->text().value());
 }
 
 
@@ -92,17 +92,17 @@ TEST(ValuesTest, InvalidInput)
 
 TEST(ValuesTest, SetSubtraction)
 {
-  Value::Set set1 = parse("{sda1, sda2, sda3}").get().set();
-  Value::Set set2 = parse("{sda2, sda3}").get().set();
-  Value::Set set3 = parse("{sda4}").get().set();
+  Value::Set set1 = parse("{sda1, sda2, sda3}")->set();
+  Value::Set set2 = parse("{sda2, sda3}")->set();
+  Value::Set set3 = parse("{sda4}")->set();
 
   set1 -= set2;
 
-  EXPECT_EQ(set1, parse("{sda1}").get().set());
+  EXPECT_EQ(set1, parse("{sda1}")->set());
 
   set3 -= set1;
 
-  EXPECT_EQ(set3, parse("{sda4}").get().set());
+  EXPECT_EQ(set3, parse("{sda4}")->set());
 }
 
 
@@ -116,7 +116,7 @@ TEST(ValuesTest, RangesParse)
   range->set_end(10);
 
   Value::Ranges parsed =
-    parse("[1-10]").get().ranges();
+    parse("[1-10]")->ranges();
 
   EXPECT_EQ(ranges, parsed);
 }
@@ -164,84 +164,84 @@ TEST(ValuesTest, RangesCoalesceParse)
   range->set_begin(1);
   range->set_end(10);
   Value::Ranges parsed =
-    parse("[4-6, 6-8, 5-9, 3-4, 2-5, 4-6, 1-1, 10-10, 4-6]").get().ranges();
+    parse("[4-6, 6-8, 5-9, 3-4, 2-5, 4-6, 1-1, 10-10, 4-6]")->ranges();
 
   EXPECT_EQ(ranges, parsed);
   EXPECT_EQ(1, parsed.range_size());
 
   // Simple overlap.
-  parsed = parse("[4-6, 6-8]").get().ranges();
-  Value::Ranges expected = parse("[4-8]").get().ranges();
+  parsed = parse("[4-6, 6-8]")->ranges();
+  Value::Ranges expected = parse("[4-8]")->ranges();
 
   EXPECT_EQ(parsed, expected);
   EXPECT_EQ(1, parsed.range_size());
 
   // Simple overlap unordered.
-  parsed = parse("[6-8, 4-6]").get().ranges();
-  expected = parse("[4-8]").get().ranges();
+  parsed = parse("[6-8, 4-6]")->ranges();
+  expected = parse("[4-8]")->ranges();
 
   EXPECT_EQ(parsed, expected);
   EXPECT_EQ(1, parsed.range_size());
 
   // Subsumed range.
-  parsed = parse("[1-10, 8-10]").get().ranges();
-  expected = parse("[1-10]").get().ranges();
+  parsed = parse("[1-10, 8-10]")->ranges();
+  expected = parse("[1-10]")->ranges();
 
   EXPECT_EQ(parsed, expected);
   EXPECT_EQ(1, parsed.range_size());
 
   // Completely subsumed.
-  parsed = parse("[1-11, 8-10]").get().ranges();
-  expected = parse("[1-11]").get().ranges();
+  parsed = parse("[1-11, 8-10]")->ranges();
+  expected = parse("[1-11]")->ranges();
 
   EXPECT_EQ(parsed, expected);
   EXPECT_EQ(1, parsed.range_size());
 
   // Multiple overlapping ranges.
-  parsed = parse("[1-4, 4-5, 7-8, 8-10]").get().ranges();
-  expected = parse("[1-5, 7-10]").get().ranges();
+  parsed = parse("[1-4, 4-5, 7-8, 8-10]")->ranges();
+  expected = parse("[1-5, 7-10]")->ranges();
 
   EXPECT_EQ(parsed, expected);
   EXPECT_EQ(2, parsed.range_size());
 
   // Multiple overlap mixed.
-  parsed = parse("[7-8, 1-4, [8-10], 4-5]").get().ranges();
-  expected = parse("[1-5, 7-10]").get().ranges();
+  parsed = parse("[7-8, 1-4, [8-10], 4-5]")->ranges();
+  expected = parse("[1-5, 7-10]")->ranges();
 
   EXPECT_EQ(parsed, expected);
   EXPECT_EQ(2, parsed.range_size());
 
   // Simple neighboring with overlap.
-  parsed = parse("[4-6, 7-8]").get().ranges();
-  expected = parse("[4-8]").get().ranges();
+  parsed = parse("[4-6, 7-8]")->ranges();
+  expected = parse("[4-8]")->ranges();
 
   EXPECT_EQ(parsed, expected);
   EXPECT_EQ(1, parsed.range_size());
 
   // Single neighbouring.
-  parsed = parse("[4-6, 7-7]").get().ranges();
-  expected = parse("[4-7]").get().ranges();
+  parsed = parse("[4-6, 7-7]")->ranges();
+  expected = parse("[4-7]")->ranges();
 
   EXPECT_EQ(parsed, expected);
   EXPECT_EQ(1, parsed.range_size());
 
   // Multiple ranges coalescing into a single one.
-  parsed = parse("[4-6, 7-7, 8-8, 9-9]").get().ranges();
-  expected = parse("[4-9]").get().ranges();
+  parsed = parse("[4-6, 7-7, 8-8, 9-9]")->ranges();
+  expected = parse("[4-9]")->ranges();
 
   EXPECT_EQ(parsed, expected);
   EXPECT_EQ(1, parsed.range_size());
 
   // Multiple ranges coalescing into multiple ranges.
-  parsed = parse("[4-6, 7-7, 9-10, 9-11]").get().ranges();
-  expected = parse("[4-7, 9-11]").get().ranges();
+  parsed = parse("[4-6, 7-7, 9-10, 9-11]")->ranges();
+  expected = parse("[4-7, 9-11]")->ranges();
 
   EXPECT_EQ(parsed, expected);
   EXPECT_EQ(2, parsed.range_size());
 
   // Multiple duplicates.
-  parsed = parse("[6-8, 6-8, 4-6, 6-8]").get().ranges();
-  expected = parse("[4-8]").get().ranges();
+  parsed = parse("[6-8, 6-8, 4-6, 6-8]")->ranges();
+  expected = parse("[4-8]")->ranges();
   EXPECT_EQ(parsed, expected);
   EXPECT_EQ(1, parsed.range_size());
 }
@@ -380,98 +380,98 @@ TEST(ValuesTest, IntervalSetToRanges)
 TEST(ValuesTest, RangesAddition)
 {
   // Overlaps on right.
-  Value::Ranges ranges1 = parse("[3-8]").get().ranges();
-  Value::Ranges ranges2 = parse("[4-10]").get().ranges();
+  Value::Ranges ranges1 = parse("[3-8]")->ranges();
+  Value::Ranges ranges2 = parse("[4-10]")->ranges();
 
-  EXPECT_EQ(parse("[3-10]").get().ranges(), ranges1 + ranges2);
+  EXPECT_EQ(parse("[3-10]")->ranges(), ranges1 + ranges2);
 
   // Overlapps on right.
-  ranges1 = parse("[3-8]").get().ranges();
-  ranges2 = parse("[1-4]").get().ranges();
+  ranges1 = parse("[3-8]")->ranges();
+  ranges2 = parse("[1-4]")->ranges();
 
-  EXPECT_EQ(parse("[1-8]").get().ranges(), ranges1 + ranges2);
+  EXPECT_EQ(parse("[1-8]")->ranges(), ranges1 + ranges2);
 
   // Completely subsumed.
-  ranges1 = parse("[2-3]").get().ranges();
-  ranges2 = parse("[1-4]").get().ranges();
+  ranges1 = parse("[2-3]")->ranges();
+  ranges2 = parse("[1-4]")->ranges();
 
-  EXPECT_EQ(parse("[1-4]").get().ranges(), ranges1 + ranges2);
+  EXPECT_EQ(parse("[1-4]")->ranges(), ranges1 + ranges2);
 
   // Neighbouring right.
-  ranges1 = parse("[2-3]").get().ranges();
-  ranges2 = parse("[4-6]").get().ranges();
+  ranges1 = parse("[2-3]")->ranges();
+  ranges2 = parse("[4-6]")->ranges();
 
-  EXPECT_EQ(parse("[2-6]").get().ranges(), ranges1 + ranges2);
+  EXPECT_EQ(parse("[2-6]")->ranges(), ranges1 + ranges2);
 
   // Neighbouring left.
-  ranges1 = parse("[3-5]").get().ranges();
-  ranges2 = parse("[1-2]").get().ranges();
+  ranges1 = parse("[3-5]")->ranges();
+  ranges2 = parse("[1-2]")->ranges();
 
-  EXPECT_EQ(parse("[1-5]").get().ranges(), ranges1 + ranges2);
+  EXPECT_EQ(parse("[1-5]")->ranges(), ranges1 + ranges2);
 
   // Fills gap.
-  ranges1 = parse("[3-5, 7-8]").get().ranges();
-  ranges2 = parse("[6-6]").get().ranges();
+  ranges1 = parse("[3-5, 7-8]")->ranges();
+  ranges2 = parse("[6-6]")->ranges();
 
-  EXPECT_EQ(parse("[3-8]").get().ranges(), ranges1 + ranges2);
+  EXPECT_EQ(parse("[3-8]")->ranges(), ranges1 + ranges2);
 
   // Fills double gap.
-  ranges1 = parse("[1-4, 9-10, 20-22, 26-30]").get().ranges();
-  ranges2 = parse("[5-8, 23-25]").get().ranges();
+  ranges1 = parse("[1-4, 9-10, 20-22, 26-30]")->ranges();
+  ranges2 = parse("[5-8, 23-25]")->ranges();
 
-  EXPECT_EQ(parse("[1-10, 20-30]").get().ranges(), ranges1 + ranges2);
+  EXPECT_EQ(parse("[1-10, 20-30]")->ranges(), ranges1 + ranges2);
 }
 
 // Test subtracting two ranges.
 TEST(ValuesTest, RangesSubtraction)
 {
   // Completely subsumes.
-  Value::Ranges ranges1 = parse("[3-8]").get().ranges();
-  Value::Ranges ranges2 = parse("[1-10]").get().ranges();
+  Value::Ranges ranges1 = parse("[3-8]")->ranges();
+  Value::Ranges ranges2 = parse("[1-10]")->ranges();
 
-  EXPECT_EQ(parse("[]").get().ranges(), ranges1 - ranges2);
+  EXPECT_EQ(parse("[]")->ranges(), ranges1 - ranges2);
 
   // Subsummed on left.
-  ranges1 = parse("[3-8]").get().ranges();
-  ranges2 = parse("[3-5]").get().ranges();
+  ranges1 = parse("[3-8]")->ranges();
+  ranges2 = parse("[3-5]")->ranges();
 
-  EXPECT_EQ(parse("[6-8]").get().ranges(), ranges1 - ranges2);
+  EXPECT_EQ(parse("[6-8]")->ranges(), ranges1 - ranges2);
 
   // Subsummed on right.
-  ranges1 = parse("[3-8]").get().ranges();
-  ranges2 = parse("[5-8]").get().ranges();
+  ranges1 = parse("[3-8]")->ranges();
+  ranges2 = parse("[5-8]")->ranges();
 
-  EXPECT_EQ(parse("[3-4]").get().ranges(), ranges1 - ranges2);
+  EXPECT_EQ(parse("[3-4]")->ranges(), ranges1 - ranges2);
 
   // Subsummed in the middle.
-  ranges1 = parse("[3-8]").get().ranges();
-  ranges2 = parse("[5-6]").get().ranges();
+  ranges1 = parse("[3-8]")->ranges();
+  ranges2 = parse("[5-6]")->ranges();
 
-  EXPECT_EQ(parse("[3-4, 7-8]").get().ranges(), ranges1 - ranges2);
+  EXPECT_EQ(parse("[3-4, 7-8]")->ranges(), ranges1 - ranges2);
 
   // Overlaps to the left.
-  ranges1 = parse("[3-8]").get().ranges();
-  ranges2 = parse("[1-3]").get().ranges();
+  ranges1 = parse("[3-8]")->ranges();
+  ranges2 = parse("[1-3]")->ranges();
 
-  EXPECT_EQ(parse("[4-8]").get().ranges(), ranges1 - ranges2);
+  EXPECT_EQ(parse("[4-8]")->ranges(), ranges1 - ranges2);
 
   // Overlaps to the right.
-  ranges1 = parse("[3-8]").get().ranges();
-  ranges2 = parse("[5-10]").get().ranges();
+  ranges1 = parse("[3-8]")->ranges();
+  ranges2 = parse("[5-10]")->ranges();
 
-  EXPECT_EQ(parse("[3-4]").get().ranges(), ranges1 - ranges2);
+  EXPECT_EQ(parse("[3-4]")->ranges(), ranges1 - ranges2);
 
   // Doesn't overlap right.
-  ranges1 = parse("[3-8]").get().ranges();
-  ranges2 = parse("[9-10]").get().ranges();
+  ranges1 = parse("[3-8]")->ranges();
+  ranges2 = parse("[9-10]")->ranges();
 
-  EXPECT_EQ(parse("[3-8]").get().ranges(), ranges1 - ranges2);
+  EXPECT_EQ(parse("[3-8]")->ranges(), ranges1 - ranges2);
 
   // Doesn't overlap left.
-  ranges1 = parse("[3-8]").get().ranges();
-  ranges2 = parse("[1-2]").get().ranges();
+  ranges1 = parse("[3-8]")->ranges();
+  ranges2 = parse("[1-2]")->ranges();
 
-  EXPECT_EQ(parse("[3-8]").get().ranges(), ranges1 - ranges2);
+  EXPECT_EQ(parse("[3-8]")->ranges(), ranges1 - ranges2);
 }
 
 } // namespace tests {

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/zookeeper_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/zookeeper_tests.cpp b/src/tests/zookeeper_tests.cpp
index 72279a3..f2f9858 100644
--- a/src/tests/zookeeper_tests.cpp
+++ b/src/tests/zookeeper_tests.cpp
@@ -182,14 +182,14 @@ TEST_F(ZooKeeperTest, LeaderDetector)
   EXPECT_SOME_EQ(membership2.get(), leader.get());
 
   // Cancelling the only member results in no leader elected.
-  leader = detector.detect(leader.get().get());
+  leader = detector.detect(leader->get());
   EXPECT_TRUE(leader.isPending());
   cancellation = group.cancel(membership2.get());
 
   AWAIT_READY(cancellation);
   EXPECT_TRUE(cancellation.get());
   AWAIT_READY(leader);
-  ASSERT_TRUE(leader.get().isNone());
+  ASSERT_TRUE(leader->isNone());
 }
 
 
@@ -245,7 +245,7 @@ TEST_F(ZooKeeperTest, LeaderDetectorCancellationHandling)
   EXPECT_SOME(leader.get());
 
   // Cancel the member and join another.
-  Future<bool> cancelled = group.cancel(leader.get().get());
+  Future<bool> cancelled = group.cancel(leader->get());
   AWAIT_READY(cancelled);
   EXPECT_TRUE(cancelled.get());
 
@@ -303,7 +303,7 @@ TEST_F(ZooKeeperTest, LeaderContender)
   Future<Nothing> connected = FUTURE_DISPATCH(
       group.process->self(),
       &GroupProcess::connected);
-  server->expireSession(session.get().get());
+  server->expireSession(session->get());
   AWAIT_READY(lostCandidacy);
 
   // Withdraw directly returns because candidacy is lost and there
@@ -322,7 +322,7 @@ TEST_F(ZooKeeperTest, LeaderContender)
   AWAIT_READY(session);
   ASSERT_SOME(session.get());
 
-  server->expireSession(session.get().get());
+  server->expireSession(session->get());
 
   Clock::pause();
   // The retry timeout.

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/zookeeper_url_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/zookeeper_url_tests.cpp b/src/tests/zookeeper_url_tests.cpp
index 2b6345f..498606a 100644
--- a/src/tests/zookeeper_url_tests.cpp
+++ b/src/tests/zookeeper_url_tests.cpp
@@ -26,48 +26,48 @@ TEST(ZooKeeperURLTest, URL)
   Try<zookeeper::URL> url =
     zookeeper::URL::parse("zk://host1:port1");
   EXPECT_SOME(url);
-  EXPECT_TRUE(url.get().authentication.isNone());
-  EXPECT_EQ("host1:port1", url.get().servers);
-  EXPECT_EQ("/", url.get().path);
+  EXPECT_TRUE(url->authentication.isNone());
+  EXPECT_EQ("host1:port1", url->servers);
+  EXPECT_EQ("/", url->path);
 
   url = zookeeper::URL::parse("zk://jake:1@host1:port1");
   EXPECT_SOME(url);
-  EXPECT_FALSE(url.get().authentication.isNone());
-  EXPECT_EQ("digest", url.get().authentication.get().scheme);
-  EXPECT_EQ("jake:1", url.get().authentication.get().credentials);
-  EXPECT_EQ("host1:port1", url.get().servers);
-  EXPECT_EQ("/", url.get().path);
+  EXPECT_FALSE(url->authentication.isNone());
+  EXPECT_EQ("digest", url->authentication->scheme);
+  EXPECT_EQ("jake:1", url->authentication->credentials);
+  EXPECT_EQ("host1:port1", url->servers);
+  EXPECT_EQ("/", url->path);
 
   url = zookeeper::URL::parse("zk://jake:1@host1:port1/");
   EXPECT_SOME(url);
-  EXPECT_FALSE(url.get().authentication.isNone());
-  EXPECT_EQ("digest", url.get().authentication.get().scheme);
-  EXPECT_EQ("jake:1", url.get().authentication.get().credentials);
-  EXPECT_EQ("host1:port1", url.get().servers);
-  EXPECT_EQ("/", url.get().path);
+  EXPECT_FALSE(url->authentication.isNone());
+  EXPECT_EQ("digest", url->authentication->scheme);
+  EXPECT_EQ("jake:1", url->authentication->credentials);
+  EXPECT_EQ("host1:port1", url->servers);
+  EXPECT_EQ("/", url->path);
 
   url = zookeeper::URL::parse("zk://jake:1@host1:port1,host2:port2");
   EXPECT_SOME(url);
-  EXPECT_FALSE(url.get().authentication.isNone());
-  EXPECT_EQ("digest", url.get().authentication.get().scheme);
-  EXPECT_EQ("jake:1", url.get().authentication.get().credentials);
-  EXPECT_EQ("host1:port1,host2:port2", url.get().servers);
-  EXPECT_EQ("/", url.get().path);
+  EXPECT_FALSE(url->authentication.isNone());
+  EXPECT_EQ("digest", url->authentication->scheme);
+  EXPECT_EQ("jake:1", url->authentication->credentials);
+  EXPECT_EQ("host1:port1,host2:port2", url->servers);
+  EXPECT_EQ("/", url->path);
 
   url = zookeeper::URL::parse("zk://jake:1@host1:port1,host2:port2/");
   EXPECT_SOME(url);
-  EXPECT_FALSE(url.get().authentication.isNone());
-  EXPECT_EQ("digest", url.get().authentication.get().scheme);
-  EXPECT_EQ("jake:1", url.get().authentication.get().credentials);
-  EXPECT_EQ("host1:port1,host2:port2", url.get().servers);
-  EXPECT_EQ("/", url.get().path);
+  EXPECT_FALSE(url->authentication.isNone());
+  EXPECT_EQ("digest", url->authentication->scheme);
+  EXPECT_EQ("jake:1", url->authentication->credentials);
+  EXPECT_EQ("host1:port1,host2:port2", url->servers);
+  EXPECT_EQ("/", url->path);
 
   url =
     zookeeper::URL::parse("zk://jake:1@host1:port1,host2:port2/path/to/znode");
   EXPECT_SOME(url);
-  EXPECT_FALSE(url.get().authentication.isNone());
-  EXPECT_EQ("digest", url.get().authentication.get().scheme);
-  EXPECT_EQ("jake:1", url.get().authentication.get().credentials);
-  EXPECT_EQ("host1:port1,host2:port2", url.get().servers);
-  EXPECT_EQ("/path/to/znode", url.get().path);
+  EXPECT_FALSE(url->authentication.isNone());
+  EXPECT_EQ("digest", url->authentication->scheme);
+  EXPECT_EQ("jake:1", url->authentication->credentials);
+  EXPECT_EQ("host1:port1,host2:port2", url->servers);
+  EXPECT_EQ("/path/to/znode", url->path);
 }


[6/8] mesos git commit: Replace `.get().` in favor of the `->` operator in tests.

Posted by bm...@apache.org.
http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/credentials_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/credentials_tests.cpp b/src/tests/credentials_tests.cpp
index 809f8c7..9316690 100644
--- a/src/tests/credentials_tests.cpp
+++ b/src/tests/credentials_tests.cpp
@@ -65,7 +65,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(CredentialsTest, AuthenticatedSlave)
   ASSERT_SOME(slave);
 
   AWAIT_READY(slaveRegisteredMessage);
-  ASSERT_NE("", slaveRegisteredMessage.get().slave_id().value());
+  ASSERT_NE("", slaveRegisteredMessage->slave_id().value());
 }
 
 
@@ -110,7 +110,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(CredentialsTest, AuthenticatedSlaveText)
   ASSERT_SOME(slave);
 
   AWAIT_READY(slaveRegisteredMessage);
-  ASSERT_NE("", slaveRegisteredMessage.get().slave_id().value());
+  ASSERT_NE("", slaveRegisteredMessage->slave_id().value());
 }
 
 
@@ -163,7 +163,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(CredentialsTest, AuthenticatedSlaveJSON)
   ASSERT_SOME(slave);
 
   AWAIT_READY(slaveRegisteredMessage);
-  ASSERT_NE("", slaveRegisteredMessage.get().slave_id().value());
+  ASSERT_NE("", slaveRegisteredMessage->slave_id().value());
 }
 
 } // namespace tests {

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/default_executor_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/default_executor_tests.cpp b/src/tests/default_executor_tests.cpp
index a09ae11..b701e7d 100644
--- a/src/tests/default_executor_tests.cpp
+++ b/src/tests/default_executor_tests.cpp
@@ -223,7 +223,7 @@ TEST_P(DefaultExecutorTest, TaskRunning)
   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);
   JSON::Object state = parse.get();
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/disk_quota_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/disk_quota_tests.cpp b/src/tests/disk_quota_tests.cpp
index d2dfc94..d67867e 100644
--- a/src/tests/disk_quota_tests.cpp
+++ b/src/tests/disk_quota_tests.cpp
@@ -660,7 +660,7 @@ TEST_F(DiskQuotaTest, SlaveRecovery)
 
       // NOTE: This is to capture the regression in MESOS-2452. The data
       // stored in the executor meta directory should be less than 64K.
-      if (usage.get().disk_used_bytes() > Kilobytes(64).bytes()) {
+      if (usage->disk_used_bytes() > Kilobytes(64).bytes()) {
         break;
       }
     }

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/dynamic_weights_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/dynamic_weights_tests.cpp b/src/tests/dynamic_weights_tests.cpp
index 5571ab7..3c86325 100644
--- a/src/tests/dynamic_weights_tests.cpp
+++ b/src/tests/dynamic_weights_tests.cpp
@@ -96,11 +96,11 @@ protected:
             createBasicAuthHeaders(credential)));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-      << response.get().body;
+      << response->body;
 
     AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response);
 
-    Try<JSON::Value> parse = JSON::parse(response.get().body);
+    Try<JSON::Value> parse = JSON::parse(response->body);
     ASSERT_SOME(parse);
 
     // Create Protobuf representation of weights.
@@ -168,7 +168,7 @@ TEST_F(DynamicWeightsTest, PutInvalidRequest)
           badRequest));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(BadRequest().status, response)
-    << response.get().body;
+    << response->body;
 
   checkWithGetRequest(master.get()->pid, DEFAULT_CREDENTIAL);
 
@@ -190,7 +190,7 @@ TEST_F(DynamicWeightsTest, PutInvalidRequest)
           badRequest));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(BadRequest().status, response)
-    << response.get().body;
+    << response->body;
 
   checkWithGetRequest(master.get()->pid, DEFAULT_CREDENTIAL);
 }
@@ -215,7 +215,7 @@ TEST_F(DynamicWeightsTest, ZeroWeight)
           strings::format("%s", JSON::protobuf(infos)).get()));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(BadRequest().status, response)
-    << response.get().body;
+    << response->body;
 
   checkWithGetRequest(master.get()->pid, DEFAULT_CREDENTIAL);
 }
@@ -240,7 +240,7 @@ TEST_F(DynamicWeightsTest, NegativeWeight)
           strings::format("%s", JSON::protobuf(infos)).get()));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(BadRequest().status, response)
-    << response.get().body;
+    << response->body;
 
   checkWithGetRequest(master.get()->pid, DEFAULT_CREDENTIAL);
 }
@@ -265,7 +265,7 @@ TEST_F(DynamicWeightsTest, NonNumericWeight)
           strings::format("%s", JSON::protobuf(infos)).get()));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(BadRequest().status, response)
-    << response.get().body;
+    << response->body;
 
   checkWithGetRequest(master.get()->pid, DEFAULT_CREDENTIAL);
 }
@@ -289,7 +289,7 @@ TEST_F(DynamicWeightsTest, MissingRole)
           "weights=[{\"weight\":2.0}]"));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(BadRequest().status, response1)
-    << response1.get().body;
+    << response1->body;
 
   checkWithGetRequest(master.get()->pid, DEFAULT_CREDENTIAL);
 
@@ -305,7 +305,7 @@ TEST_F(DynamicWeightsTest, MissingRole)
           strings::format("%s", JSON::protobuf(infos)).get()));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(BadRequest().status, response2)
-    << response2.get().body;
+    << response2->body;
 
   checkWithGetRequest(master.get()->pid, DEFAULT_CREDENTIAL);
 }
@@ -334,7 +334,7 @@ TEST_F(DynamicWeightsTest, UnknownRole)
           strings::format("%s", JSON::protobuf(infos)).get()));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(BadRequest().status, response)
-    << response.get().body;
+    << response->body;
 
   checkWithGetRequest(master.get()->pid, DEFAULT_CREDENTIAL);
 }
@@ -365,7 +365,7 @@ TEST_F(DynamicWeightsTest, UpdateWeightsWithExplictRoles)
           strings::format("%s", JSON::protobuf(infos)).get()));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-    << response.get().body;
+    << response->body;
 
   checkWithGetRequest(master.get()->pid, DEFAULT_CREDENTIAL, UPDATED_WEIGHTS1);
 }
@@ -396,7 +396,7 @@ TEST_F(DynamicWeightsTest, UnauthenticatedUpdateWeightRequest)
           strings::format("%s", JSON::protobuf(infos)).get()));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(Unauthorized({}).status, response1)
-    << response1.get().body;
+    << response1->body;
 
   checkWithGetRequest(master.get()->pid, DEFAULT_CREDENTIAL);
 
@@ -412,7 +412,7 @@ TEST_F(DynamicWeightsTest, UnauthenticatedUpdateWeightRequest)
           strings::format("%s", JSON::protobuf(infos)).get()));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(Unauthorized({}).status, response2)
-    << response2.get().body;
+    << response2->body;
 
   checkWithGetRequest(master.get()->pid, DEFAULT_CREDENTIAL);
 }
@@ -441,7 +441,7 @@ TEST_F(DynamicWeightsTest, UnauthenticatedQueryWeightRequest)
           createBasicAuthHeaders(credential)));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(Unauthorized({}).status, response)
-    << response.get().body;
+    << response->body;
 }
 
 
@@ -485,7 +485,7 @@ TEST_F(DynamicWeightsTest, AuthorizedGetWeightsRequest)
           strings::format("%s", JSON::protobuf(infos)).get()));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-    << response.get().body;
+    << response->body;
 
   checkWithGetRequest(master.get()->pid, DEFAULT_CREDENTIAL, GET_WEIGHTS1);
 
@@ -529,7 +529,7 @@ TEST_F(DynamicWeightsTest, AuthorizedWeightUpdateRequest)
           strings::format("%s", JSON::protobuf(infos)).get()));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-    << response.get().body;
+    << response->body;
 
   checkWithGetRequest(master.get()->pid, DEFAULT_CREDENTIAL, UPDATED_WEIGHTS1);
 }
@@ -574,7 +574,7 @@ TEST_F(DynamicWeightsTest, AuthorizedUpdateWeightRequestWithoutPrincipal)
           strings::format("%s", JSON::protobuf(infos)).get()));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-    << response.get().body;
+    << response->body;
 
   checkWithGetRequest(master.get()->pid, DEFAULT_CREDENTIAL, UPDATED_WEIGHTS1);
 }
@@ -606,7 +606,7 @@ TEST_F(DynamicWeightsTest, UnauthorizedWeightUpdateRequest)
           strings::format("%s", JSON::protobuf(infos)).get()));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(Forbidden().status, response)
-    << response.get().body;
+    << response->body;
 
   checkWithGetRequest(master.get()->pid, DEFAULT_CREDENTIAL);
 }
@@ -660,7 +660,7 @@ TEST_F(DynamicWeightsTest, RecoveredWeightsFromRegistry)
             strings::format("%s", JSON::protobuf(infos)).get()));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-      << response.get().body;
+      << response->body;
 
     checkWithGetRequest(
         master.get()->pid,

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/environment.cpp
----------------------------------------------------------------------
diff --git a/src/tests/environment.cpp b/src/tests/environment.cpp
index 4c6c8f6..e3cff18 100644
--- a/src/tests/environment.cpp
+++ b/src/tests/environment.cpp
@@ -152,7 +152,7 @@ public:
       std::cerr
         << "-------------------------------------------------------------\n"
         << "The 'CFS_' tests cannot be run because:\n"
-        << cfsError.get().message << "\n"
+        << cfsError->message << "\n"
         << "-------------------------------------------------------------"
         << std::endl;
     }
@@ -191,7 +191,7 @@ public:
         << std::endl;
 
       error = hierarchies.error();
-    } else if (!hierarchies.get().empty()) {
+    } else if (!hierarchies->empty()) {
       std::cerr
         << "-------------------------------------------------------------\n"
         << "We cannot run any cgroups tests that require mounting\n"
@@ -304,7 +304,7 @@ public:
       std::cerr
         << "-------------------------------------------------------------\n"
         << "We cannot run any Docker tests because:\n"
-        << dockerError.get().message << "\n"
+        << dockerError->message << "\n"
         << "-------------------------------------------------------------"
         << std::endl;
     }
@@ -511,7 +511,7 @@ public:
       std::cerr
         << "-------------------------------------------------------------\n"
         << "We cannot run any " << fsname << " tests because:\n"
-        << fsSupportError.get().message << "\n"
+        << fsSupportError->message << "\n"
         << "-------------------------------------------------------------\n";
     }
   }
@@ -586,7 +586,7 @@ public:
     if (perfError.isSome()) {
       std::cerr
         << "-------------------------------------------------------------\n"
-        << perfError.get().message << "\n"
+        << perfError->message << "\n"
         << "-------------------------------------------------------------"
         << std::endl;
     }
@@ -832,7 +832,7 @@ void Environment::TearDown()
   // that we can identify leaked processes more precisely.
   Try<os::ProcessTree> pstree = os::pstree(0);
 
-  if (pstree.isSome() && !pstree.get().children.empty()) {
+  if (pstree.isSome() && !pstree->children.empty()) {
     FAIL() << "Tests completed with child processes remaining:\n"
            << pstree.get();
   }

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/exception_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/exception_tests.cpp b/src/tests/exception_tests.cpp
index 316c329..b5b657c 100644
--- a/src/tests/exception_tests.cpp
+++ b/src/tests/exception_tests.cpp
@@ -161,7 +161,7 @@ TEST_F(ExceptionTest, DisallowSchedulerCallbacksOnAbort)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // None of these callbacks should be invoked.
   EXPECT_CALL(sched, offerRescinded(&driver, _))
@@ -188,7 +188,7 @@ TEST_F(ExceptionTest, DisallowSchedulerCallbacksOnAbort)
   RescindResourceOfferMessage rescindMessage;
   rescindMessage.mutable_offer_id()->MergeFrom(offers.get()[0].id());
 
-  process::post(message.get().to, rescindMessage);
+  process::post(message->to, rescindMessage);
 
   AWAIT_READY(rescindMsg);
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/executor_http_api_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/executor_http_api_tests.cpp b/src/tests/executor_http_api_tests.cpp
index 892f8f6..13d2e1d 100644
--- a/src/tests/executor_http_api_tests.cpp
+++ b/src/tests/executor_http_api_tests.cpp
@@ -357,7 +357,7 @@ TEST_P(ExecutorHttpApiTest, DefaultAccept)
   AWAIT_READY(frameworkId);
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
 
   Future<v1::executor::Mesos*> executorLib;
   EXPECT_CALL(*executor, connected(_))
@@ -434,7 +434,7 @@ TEST_P(ExecutorHttpApiTest, NoAcceptHeader)
   AWAIT_READY(frameworkId);
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
 
   Future<v1::executor::Mesos*> executorLib;
   EXPECT_CALL(*executor, connected(_))
@@ -815,7 +815,7 @@ TEST_P(ExecutorHttpApiTest, Subscribe)
   AWAIT_READY(frameworkId);
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
 
   Future<Message> registerExecutorMessage =
     DROP_MESSAGE(Eq(RegisterExecutorMessage().GetTypeName()), _, _);
@@ -853,9 +853,9 @@ TEST_P(ExecutorHttpApiTest, Subscribe)
   AWAIT_EXPECT_RESPONSE_HEADER_EQ("chunked", "Transfer-Encoding", response);
   AWAIT_EXPECT_RESPONSE_HEADER_EQ(contentTypeString, "Content-Type", response);
 
-  ASSERT_EQ(Response::PIPE, response.get().type);
+  ASSERT_EQ(Response::PIPE, response->type);
 
-  Option<Pipe::Reader> reader = response.get().reader;
+  Option<Pipe::Reader> reader = response->reader;
   ASSERT_SOME(reader);
 
   auto deserializer =
@@ -870,12 +870,12 @@ TEST_P(ExecutorHttpApiTest, Subscribe)
   ASSERT_SOME(event.get());
 
   // Check event type is subscribed and if the ExecutorID matches.
-  ASSERT_EQ(Event::SUBSCRIBED, event.get().get().type());
-  ASSERT_EQ(event.get().get().subscribed().executor_info().executor_id(),
+  ASSERT_EQ(Event::SUBSCRIBED, event->get().type());
+  ASSERT_EQ(event->get().subscribed().executor_info().executor_id(),
             call.executor_id());
-  ASSERT_TRUE(event.get().get().subscribed().has_container_id());
+  ASSERT_TRUE(event->get().subscribed().has_container_id());
 
-  reader.get().close();
+  reader->close();
 
   driver.stop();
   driver.join();

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/fault_tolerance_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/fault_tolerance_tests.cpp b/src/tests/fault_tolerance_tests.cpp
index d6bde7f..ee2130c 100644
--- a/src/tests/fault_tolerance_tests.cpp
+++ b/src/tests/fault_tolerance_tests.cpp
@@ -189,7 +189,7 @@ TEST_F(FaultToleranceTest, ReregisterCompletedFrameworks)
       "Content-Type",
       masterState);
 
-  Try<JSON::Object> parse = JSON::parse<JSON::Object>(masterState.get().body);
+  Try<JSON::Object> parse = JSON::parse<JSON::Object>(masterState->body);
   ASSERT_SOME(parse);
   JSON::Object masterJSON = parse.get();
 
@@ -219,9 +219,9 @@ TEST_F(FaultToleranceTest, ReregisterCompletedFrameworks)
   driver.start();
 
   AWAIT_READY(frameworkId);
-  EXPECT_NE("", frameworkId.get().value());
+  EXPECT_NE("", frameworkId->value());
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Step 3. Create/launch a task.
   TaskInfo task =
@@ -238,7 +238,7 @@ TEST_F(FaultToleranceTest, ReregisterCompletedFrameworks)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   // Verify master and slave recognize the running task/framework.
   masterState = process::http::get(
@@ -249,7 +249,7 @@ TEST_F(FaultToleranceTest, ReregisterCompletedFrameworks)
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, masterState);
 
-  parse = JSON::parse<JSON::Object>(masterState.get().body);
+  parse = JSON::parse<JSON::Object>(masterState->body);
   ASSERT_SOME(parse);
   masterJSON = parse.get();
 
@@ -269,7 +269,7 @@ TEST_F(FaultToleranceTest, ReregisterCompletedFrameworks)
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, slaveState);
 
-  parse = JSON::parse<JSON::Object>(slaveState.get().body);
+  parse = JSON::parse<JSON::Object>(slaveState->body);
   ASSERT_SOME(parse);
   JSON::Object slaveJSON = parse.get();
 
@@ -291,7 +291,7 @@ TEST_F(FaultToleranceTest, ReregisterCompletedFrameworks)
   driver.killTask(task.task_id());
 
   AWAIT_READY(statusKilled);
-  ASSERT_EQ(TASK_KILLED, statusKilled.get().state());
+  ASSERT_EQ(TASK_KILLED, statusKilled->state());
 
   // At this point, the task is killed, but the framework is still
   // running.  This is because the executor has to time-out before
@@ -304,7 +304,7 @@ TEST_F(FaultToleranceTest, ReregisterCompletedFrameworks)
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, masterState);
 
-  parse = JSON::parse<JSON::Object>(masterState.get().body);
+  parse = JSON::parse<JSON::Object>(masterState->body);
   ASSERT_SOME(parse);
   masterJSON = parse.get();
 
@@ -324,7 +324,7 @@ TEST_F(FaultToleranceTest, ReregisterCompletedFrameworks)
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, slaveState);
 
-  parse = JSON::parse<JSON::Object>(slaveState.get().body);
+  parse = JSON::parse<JSON::Object>(slaveState->body);
   ASSERT_SOME(parse);
   slaveJSON = parse.get();
 
@@ -360,7 +360,7 @@ TEST_F(FaultToleranceTest, ReregisterCompletedFrameworks)
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, slaveState);
 
-  parse = JSON::parse<JSON::Object>(slaveState.get().body);
+  parse = JSON::parse<JSON::Object>(slaveState->body);
   ASSERT_SOME(parse);
   slaveJSON = parse.get();
 
@@ -410,7 +410,7 @@ TEST_F(FaultToleranceTest, ReregisterCompletedFrameworks)
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, masterState);
 
-  parse = JSON::parse<JSON::Object>(masterState.get().body);
+  parse = JSON::parse<JSON::Object>(masterState->body);
   ASSERT_SOME(parse);
   masterJSON = parse.get();
 
@@ -538,7 +538,7 @@ TEST_F(FaultToleranceTest, SchedulerReregisterAfterFailoverTimeout)
 
   // Simulate framework disconnection.
   ASSERT_TRUE(process::inject::exited(
-      frameworkRegisteredMessage.get().to, master.get()->pid));
+      frameworkRegisteredMessage->to, master.get()->pid));
 
   // Wait until master schedules the framework for removal.
   AWAIT_READY(deactivateFramework);
@@ -884,7 +884,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(FaultToleranceTest, FrameworkReregister)
   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);
 
   JSON::Array frameworks = parse->values["frameworks"].as<JSON::Array>();
@@ -951,7 +951,7 @@ TEST_F(FaultToleranceTest, DisconnectedSchedulerLaunchLost)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   AWAIT_READY(message);
 
@@ -973,9 +973,9 @@ TEST_F(FaultToleranceTest, DisconnectedSchedulerLaunchLost)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_LOST, status.get().state());
-  EXPECT_EQ(TaskStatus::REASON_MASTER_DISCONNECTED, status.get().reason());
-  EXPECT_EQ(TaskStatus::SOURCE_MASTER, status.get().source());
+  EXPECT_EQ(TASK_LOST, status->state());
+  EXPECT_EQ(TaskStatus::REASON_MASTER_DISCONNECTED, status->reason());
+  EXPECT_EQ(TaskStatus::SOURCE_MASTER, status->source());
 
   driver.stop();
   driver.join();
@@ -1014,7 +1014,7 @@ TEST_F(FaultToleranceTest, DisconnectedSchedulerLaunchDropped)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   AWAIT_READY(message);
 
@@ -1036,9 +1036,9 @@ TEST_F(FaultToleranceTest, DisconnectedSchedulerLaunchDropped)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_DROPPED, status.get().state());
-  EXPECT_EQ(TaskStatus::REASON_MASTER_DISCONNECTED, status.get().reason());
-  EXPECT_EQ(TaskStatus::SOURCE_MASTER, status.get().source());
+  EXPECT_EQ(TASK_DROPPED, status->state());
+  EXPECT_EQ(TaskStatus::REASON_MASTER_DISCONNECTED, status->reason());
+  EXPECT_EQ(TaskStatus::SOURCE_MASTER, status->source());
 
   driver.stop();
   driver.join();
@@ -1076,7 +1076,7 @@ TEST_F(FaultToleranceTest, SchedulerFailoverStatusUpdate)
   driver1.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Launch a task.
   TaskInfo task;
@@ -1286,7 +1286,7 @@ TEST_F(FaultToleranceTest, ForwardStatusUpdateUnknownExecutor)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
   Offer offer = offers.get()[0];
 
   TaskInfo task;
@@ -1336,8 +1336,8 @@ TEST_F(FaultToleranceTest, ForwardStatusUpdateUnknownExecutor)
 
   // Ensure that the scheduler receives task2's update.
   AWAIT_READY(status);
-  EXPECT_EQ(taskId, status.get().task_id());
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(taskId, status->task_id());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -1375,7 +1375,7 @@ TEST_F(FaultToleranceTest, SchedulerFailoverExecutorToFrameworkMessage)
   driver1.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("");
@@ -1398,7 +1398,7 @@ TEST_F(FaultToleranceTest, SchedulerFailoverExecutorToFrameworkMessage)
   driver1.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   MockScheduler sched2;
 
@@ -1475,7 +1475,7 @@ TEST_F(FaultToleranceTest, SchedulerFailoverFrameworkToExecutorMessage)
   driver1.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   Future<TaskStatus> status;
   EXPECT_CALL(sched1, statusUpdate(&driver1, _))
@@ -1493,7 +1493,7 @@ TEST_F(FaultToleranceTest, SchedulerFailoverFrameworkToExecutorMessage)
   driver1.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   MockScheduler sched2;
 
@@ -1598,7 +1598,7 @@ TEST_F(FaultToleranceTest, IgnoreKillTaskFromUnregisteredFramework)
   driver1.start();
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   // Wait for the status update acknowledgement to be sent. This
   // ensures the slave doesn't resend the TASK_RUNNING update to the
@@ -1647,7 +1647,7 @@ TEST_F(FaultToleranceTest, IgnoreKillTaskFromUnregisteredFramework)
   Future<mesos::scheduler::Call> killCall = FUTURE_CALL(
       mesos::scheduler::Call(), mesos::scheduler::Call::KILL, _, _);
 
-  driver1.killTask(status.get().task_id());
+  driver1.killTask(status->task_id());
 
   AWAIT_READY(killCall);
 
@@ -1662,7 +1662,7 @@ TEST_F(FaultToleranceTest, IgnoreKillTaskFromUnregisteredFramework)
   execDriver->sendStatusUpdate(finishedStatus);
 
   AWAIT_READY(status2);
-  EXPECT_EQ(TASK_FINISHED, status2.get().state());
+  EXPECT_EQ(TASK_FINISHED, status2->state());
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -1702,7 +1702,7 @@ TEST_F(FaultToleranceTest, SchedulerExit)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   AWAIT_READY(offers);
 
@@ -1725,7 +1725,7 @@ TEST_F(FaultToleranceTest, SchedulerExit)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   Future<Nothing> shutdown;
   EXPECT_CALL(exec, shutdown(_))
@@ -1874,7 +1874,7 @@ TEST_F(FaultToleranceTest, FrameworkReregisterEmptyExecutor)
   driver.start();
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_FINISHED, status.get().state());
+  EXPECT_EQ(TASK_FINISHED, status->state());
 
   // Make sure the acknowledgement is processed the slave.
   AWAIT_READY(_statusUpdateAcknowledgement);
@@ -1978,14 +1978,14 @@ TEST_F(FaultToleranceTest, SplitBrainMasters)
   AWAIT_READY(registered);
   AWAIT_READY(frameworkId);
   AWAIT_READY(runningStatus);
-  EXPECT_EQ(TASK_RUNNING, runningStatus.get().state());
+  EXPECT_EQ(TASK_RUNNING, runningStatus->state());
 
   // 2. Spoof a lost task message for the slave.
   StatusUpdateMessage lostUpdate;
   lostUpdate.mutable_update()->CopyFrom(createStatusUpdate(
       frameworkId.get(),
-      runningStatus.get().slave_id(),
-      runningStatus.get().task_id(),
+      runningStatus->slave_id(),
+      runningStatus->task_id(),
       TASK_LOST,
       TaskStatus::SOURCE_SLAVE,
       UUID::random()));
@@ -1993,7 +1993,7 @@ TEST_F(FaultToleranceTest, SplitBrainMasters)
   // Spoof a message from a random master; this should be dropped by
   // the scheduler driver. Since this is delivered locally, it is
   // synchronously placed on the scheduler driver's queue.
-  process::post(UPID("master2@127.0.0.1:50"), registered.get().to, lostUpdate);
+  process::post(UPID("master2@127.0.0.1:50"), registered->to, lostUpdate);
 
   // 3. Once the message is sent to the scheduler, kill the task.
   EXPECT_CALL(exec, killTask(_, _))
@@ -2003,11 +2003,11 @@ TEST_F(FaultToleranceTest, SplitBrainMasters)
   EXPECT_CALL(sched, statusUpdate(&driver, _))
     .WillOnce(FutureArg<1>(&killedStatus));
 
-  driver.killTask(runningStatus.get().task_id());
+  driver.killTask(runningStatus->task_id());
 
   // 4. Ensure the task was KILLED rather than LOST.
   AWAIT_READY(killedStatus);
-  EXPECT_EQ(TASK_KILLED, killedStatus.get().state());
+  EXPECT_EQ(TASK_KILLED, killedStatus->state());
 
   EXPECT_CALL(exec, shutdown(_))
     .WillRepeatedly(Return());

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/fetcher_cache_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/fetcher_cache_tests.cpp b/src/tests/fetcher_cache_tests.cpp
index 85246ef..49173af 100644
--- a/src/tests/fetcher_cache_tests.cpp
+++ b/src/tests/fetcher_cache_tests.cpp
@@ -299,7 +299,7 @@ void FetcherCacheTest::startSlave()
   slave = _slave.get();
 
   AWAIT_READY(slaveRegisteredMessage);
-  slaveId = slaveRegisteredMessage.get().slave_id();
+  slaveId = slaveRegisteredMessage->slave_id();
 
   cacheDirectory =
     slave::paths::getSlavePath(flags.fetcher_cache_dir, slaveId);
@@ -537,7 +537,7 @@ Try<vector<FetcherCacheTest::Task>> FetcherCacheTest::launchTasks(
            (offers.isFailed() ? offers.failure() : "discarded"));
   }
 
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
   const Offer offer = offers.get()[0];
 
   vector<TaskInfo> tasks;
@@ -621,7 +621,7 @@ TEST_F(FetcherCacheTest, LocalUncached)
 
   EXPECT_EQ(0u, fetcherProcess->cacheSize());
   ASSERT_SOME(fetcherProcess->cacheFiles(slaveId, flags));
-  EXPECT_EQ(0u, fetcherProcess->cacheFiles(slaveId, flags).get().size());
+  EXPECT_EQ(0u, fetcherProcess->cacheFiles(slaveId, flags)->size());
 
   const string path = path::join(task->runDirectory.string(), COMMAND_NAME);
   EXPECT_TRUE(isExecutable(path));
@@ -658,7 +658,7 @@ TEST_F(FetcherCacheTest, LocalCached)
 
     EXPECT_EQ(1u, fetcherProcess->cacheSize());
     ASSERT_SOME(fetcherProcess->cacheFiles(slaveId, flags));
-    EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags).get().size());
+    EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags)->size());
   }
 }
 
@@ -687,7 +687,7 @@ TEST_F(FetcherCacheTest, CachedCustomFilename)
 
   EXPECT_EQ(1u, fetcherProcess->cacheSize());
   ASSERT_SOME(fetcherProcess->cacheFiles(slaveId, flags));
-  EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags).get().size());
+  EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags)->size());
 
   // Verify that the downloaded executable lives at our custom output path.
   const string executablePath = path::join(
@@ -729,7 +729,7 @@ TEST_F(FetcherCacheTest, CachedCustomOutputFileWithSubdirectory)
 
   EXPECT_EQ(1u, fetcherProcess->cacheSize());
   ASSERT_SOME(fetcherProcess->cacheFiles(slaveId, flags));
-  EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags).get().size());
+  EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags)->size());
 
   // Verify that the downloaded executable lives at our custom output file
   // path.
@@ -787,13 +787,13 @@ TEST_F(FetcherCacheTest, CachedFallback)
 
   AWAIT_READY(fetcherInfo);
 
-  ASSERT_EQ(1, fetcherInfo.get().items_size());
+  ASSERT_EQ(1, fetcherInfo->items_size());
   EXPECT_EQ(FetcherInfo::Item::BYPASS_CACHE,
-            fetcherInfo.get().items(0).action());
+            fetcherInfo->items(0).action());
 
   EXPECT_EQ(0u, fetcherProcess->cacheSize());
   ASSERT_SOME(fetcherProcess->cacheFiles(slaveId, flags));
-  EXPECT_EQ(0u, fetcherProcess->cacheFiles(slaveId, flags).get().size());
+  EXPECT_EQ(0u, fetcherProcess->cacheFiles(slaveId, flags)->size());
 }
 
 
@@ -830,7 +830,7 @@ TEST_F(FetcherCacheTest, LocalUncachedExtract)
 
   EXPECT_EQ(0u, fetcherProcess->cacheSize());
   ASSERT_SOME(fetcherProcess->cacheFiles(slaveId, flags));
-  EXPECT_EQ(0u, fetcherProcess->cacheFiles(slaveId, flags).get().size());
+  EXPECT_EQ(0u, fetcherProcess->cacheFiles(slaveId, flags)->size());
 }
 
 
@@ -865,7 +865,7 @@ TEST_F(FetcherCacheTest, LocalCachedExtract)
 
     EXPECT_EQ(1u, fetcherProcess->cacheSize());
     ASSERT_SOME(fetcherProcess->cacheFiles(slaveId, flags));
-    EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags).get().size());
+    EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags)->size());
   }
 }
 
@@ -1014,7 +1014,7 @@ TEST_F(FetcherCacheHttpTest, HttpCachedSerialized)
 
     EXPECT_EQ(1u, fetcherProcess->cacheSize());
     ASSERT_SOME(fetcherProcess->cacheFiles(slaveId, flags));
-    EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags).get().size());
+    EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags)->size());
 
     // 2 requests: 1 for content-length, 1 for download.
     EXPECT_EQ(2u, httpServer->countCommandRequests);
@@ -1063,7 +1063,7 @@ TEST_F(FetcherCacheHttpTest, HttpCachedConcurrent)
   Try<vector<Task>> tasks = launchTasks(commandInfos);
   ASSERT_SOME(tasks);
 
-  ASSERT_EQ(countTasks, tasks.get().size());
+  ASSERT_EQ(countTasks, tasks->size());
 
   // Having paused the HTTP server, ensure that FetcherProcess::_fetch()
   // has been called for each task, which means that all tasks are competing
@@ -1079,7 +1079,7 @@ TEST_F(FetcherCacheHttpTest, HttpCachedConcurrent)
 
   EXPECT_EQ(1u, fetcherProcess->cacheSize());
   ASSERT_SOME(fetcherProcess->cacheFiles(slaveId, flags));
-  EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags).get().size());
+  EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags)->size());
 
   // HTTP requests regarding the archive asset as follows. Archive
   // "content-length" requests: 1, archive file downloads: 2.
@@ -1172,7 +1172,7 @@ TEST_F(FetcherCacheHttpTest, HttpMixed)
   Try<vector<Task>> tasks = launchTasks(commandInfos);
   ASSERT_SOME(tasks);
 
-  ASSERT_EQ(3u, tasks.get().size());
+  ASSERT_EQ(3u, tasks->size());
 
   // Having paused the HTTP server, ensure that FetcherProcess::_fetch()
   // has been called for each task, which means that all tasks are competing
@@ -1188,7 +1188,7 @@ TEST_F(FetcherCacheHttpTest, HttpMixed)
 
   EXPECT_EQ(1u, fetcherProcess->cacheSize());
   ASSERT_SOME(fetcherProcess->cacheFiles(slaveId, flags));
-  EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags).get().size());
+  EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags)->size());
 
   // HTTP requests regarding the command asset as follows. Command
   // "content-length" requests: 0, command file downloads: 3.
@@ -1275,7 +1275,7 @@ TEST_F(FetcherCacheHttpTest, DISABLED_HttpCachedRecovery)
 
     EXPECT_EQ(1u, fetcherProcess->cacheSize());
     ASSERT_SOME(fetcherProcess->cacheFiles(slaveId, flags));
-    EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags).get().size());
+    EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags)->size());
 
     // content-length requests: 1
     // downloads: 1
@@ -1337,7 +1337,7 @@ TEST_F(FetcherCacheHttpTest, DISABLED_HttpCachedRecovery)
 
     EXPECT_EQ(1u, fetcherProcess->cacheSize());
     ASSERT_SOME(fetcherProcess->cacheFiles(slaveId, flags));
-    EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags).get().size());
+    EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags)->size());
 
     // content-length requests: 1
     // downloads: 1
@@ -1389,12 +1389,12 @@ TEST_F(FetcherCacheTest, SimpleEviction)
     if (i < countCacheEntries) {
       EXPECT_EQ(i + 1, fetcherProcess->cacheSize());
       ASSERT_SOME(fetcherProcess->cacheFiles(slaveId, flags));
-      EXPECT_EQ(i+1u, fetcherProcess->cacheFiles(slaveId, flags).get().size());
+      EXPECT_EQ(i+1u, fetcherProcess->cacheFiles(slaveId, flags)->size());
     } else {
       EXPECT_EQ(countCacheEntries, fetcherProcess->cacheSize());
       ASSERT_SOME(fetcherProcess->cacheFiles(slaveId, flags));
       EXPECT_EQ(countCacheEntries,
-                fetcherProcess->cacheFiles(slaveId, flags).get().size());
+                fetcherProcess->cacheFiles(slaveId, flags)->size());
     }
   }
 }
@@ -1466,9 +1466,9 @@ TEST_F(FetcherCacheTest, FallbackFromEviction)
 
   AWAIT_READY(fetcherInfo0);
 
-  ASSERT_EQ(1, fetcherInfo0.get().items_size());
+  ASSERT_EQ(1, fetcherInfo0->items_size());
   EXPECT_EQ(FetcherInfo::Item::DOWNLOAD_AND_CACHE,
-            fetcherInfo0.get().items(0).action());
+            fetcherInfo0->items(0).action());
 
   // We have put a file of size 'COMMAND_SCRIPT.size()' in the cache
   // with space 'COMMAND_SCRIPT.size() + growth'. So we must have 'growth'
@@ -1477,7 +1477,7 @@ TEST_F(FetcherCacheTest, FallbackFromEviction)
 
   EXPECT_EQ(1u, fetcherProcess->cacheSize());
   ASSERT_SOME(fetcherProcess->cacheFiles(slaveId, flags));
-  EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags).get().size());
+  EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags)->size());
 
 
   // Task 1:
@@ -1515,16 +1515,16 @@ TEST_F(FetcherCacheTest, FallbackFromEviction)
 
   AWAIT_READY(fetcherInfo1);
 
-  ASSERT_EQ(1, fetcherInfo1.get().items_size());
+  ASSERT_EQ(1, fetcherInfo1->items_size());
   EXPECT_EQ(FetcherInfo::Item::DOWNLOAD_AND_CACHE,
-            fetcherInfo1.get().items(0).action());
+            fetcherInfo1->items(0).action());
 
   // The cache must now be full.
   ASSERT_EQ(Bytes(0u), fetcherProcess->availableCacheSpace());
 
   EXPECT_EQ(1u, fetcherProcess->cacheSize());
   ASSERT_SOME(fetcherProcess->cacheFiles(slaveId, flags));
-  EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags).get().size());
+  EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags)->size());
 
 
   // Task 2:
@@ -1563,13 +1563,13 @@ TEST_F(FetcherCacheTest, FallbackFromEviction)
 
   AWAIT_READY(fetcherInfo2);
 
-  ASSERT_EQ(1, fetcherInfo2.get().items_size());
+  ASSERT_EQ(1, fetcherInfo2->items_size());
   EXPECT_EQ(FetcherInfo::Item::BYPASS_CACHE,
-            fetcherInfo2.get().items(0).action());
+            fetcherInfo2->items(0).action());
 
   EXPECT_EQ(1u, fetcherProcess->cacheSize());
   ASSERT_SOME(fetcherProcess->cacheFiles(slaveId, flags));
-  EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags).get().size());
+  EXPECT_EQ(1u, fetcherProcess->cacheFiles(slaveId, flags)->size());
 }
 
 // Tests LRU cache eviction strategy.

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/fetcher_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/fetcher_tests.cpp b/src/tests/fetcher_tests.cpp
index c4854b9..27ea724 100644
--- a/src/tests/fetcher_tests.cpp
+++ b/src/tests/fetcher_tests.cpp
@@ -569,9 +569,9 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(FetcherTest, NoExtractNotExecutable)
   Try<os::Permissions> permissions = os::permissions(basename);
 
   ASSERT_SOME(permissions);
-  EXPECT_FALSE(permissions.get().owner.x);
-  EXPECT_FALSE(permissions.get().group.x);
-  EXPECT_FALSE(permissions.get().others.x);
+  EXPECT_FALSE(permissions->owner.x);
+  EXPECT_FALSE(permissions->group.x);
+  EXPECT_FALSE(permissions->others.x);
 }
 
 
@@ -609,9 +609,9 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(FetcherTest, NoExtractExecutable)
   Try<os::Permissions> permissions = os::permissions(basename);
 
   ASSERT_SOME(permissions);
-  EXPECT_TRUE(permissions.get().owner.x);
-  EXPECT_TRUE(permissions.get().group.x);
-  EXPECT_TRUE(permissions.get().others.x);
+  EXPECT_TRUE(permissions->owner.x);
+  EXPECT_TRUE(permissions->group.x);
+  EXPECT_TRUE(permissions->others.x);
 }
 
 
@@ -662,9 +662,9 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(FetcherTest, ExtractNotExecutable)
   Try<os::Permissions> permissions = os::permissions(path.get());
 
   ASSERT_SOME(permissions);
-  EXPECT_FALSE(permissions.get().owner.x);
-  EXPECT_FALSE(permissions.get().group.x);
-  EXPECT_FALSE(permissions.get().others.x);
+  EXPECT_FALSE(permissions->owner.x);
+  EXPECT_FALSE(permissions->group.x);
+  EXPECT_FALSE(permissions->others.x);
 }
 
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/files_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/files_tests.cpp b/src/tests/files_tests.cpp
index d492adf..c703cae 100644
--- a/src/tests/files_tests.cpp
+++ b/src/tests/files_tests.cpp
@@ -585,22 +585,22 @@ TEST_F(FilesTest, AuthenticationTest)
 
   Future<Response> response = process::http::get(upid, "browse");
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(Unauthorized({}).status, response);
-  EXPECT_EQ(response.get().headers.at("WWW-Authenticate"),
+  EXPECT_EQ(response->headers.at("WWW-Authenticate"),
             expectedAuthorizationHeader);
 
   response = process::http::get(upid, "read");
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(Unauthorized({}).status, response);
-  EXPECT_EQ(response.get().headers.at("WWW-Authenticate"),
+  EXPECT_EQ(response->headers.at("WWW-Authenticate"),
             expectedAuthorizationHeader);
 
   response = process::http::get(upid, "download");
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(Unauthorized({}).status, response);
-  EXPECT_EQ(response.get().headers.at("WWW-Authenticate"),
+  EXPECT_EQ(response->headers.at("WWW-Authenticate"),
             expectedAuthorizationHeader);
 
   response = process::http::get(upid, "debug");
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(Unauthorized({}).status, response);
-  EXPECT_EQ(response.get().headers.at("WWW-Authenticate"),
+  EXPECT_EQ(response->headers.at("WWW-Authenticate"),
             expectedAuthorizationHeader);
 }
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/gc_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/gc_tests.cpp b/src/tests/gc_tests.cpp
index 6b6437c..b8fa6a4 100644
--- a/src/tests/gc_tests.cpp
+++ b/src/tests/gc_tests.cpp
@@ -293,8 +293,8 @@ TEST_F(GarbageCollectorIntegrationTest, Restart)
   EXPECT_CALL(sched, registered(_, _, _));
 
   Resources resources = Resources::parse(flags.resources.get()).get();
-  double cpus = resources.get<Value::Scalar>("cpus").get().value();
-  double mem = resources.get<Value::Scalar>("mem").get().value();
+  double cpus = resources.get<Value::Scalar>("cpus")->value();
+  double mem = resources.get<Value::Scalar>("mem")->value();
 
   EXPECT_CALL(sched, resourceOffers(_, _))
     .WillOnce(LaunchTasks(DEFAULT_EXECUTOR_INFO, 1, cpus, mem, "*"))
@@ -317,7 +317,7 @@ TEST_F(GarbageCollectorIntegrationTest, Restart)
   driver.start();
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   // Make sure directory exists. Need to do this AFTER getting a
   // status update for a task because the directory won't get created
@@ -325,7 +325,7 @@ TEST_F(GarbageCollectorIntegrationTest, Restart)
   // SlaveRegisteredMessage.
   const string& slaveDir = slave::paths::getSlavePath(
       flags.work_dir,
-      slaveRegisteredMessage.get().slave_id());
+      slaveRegisteredMessage->slave_id());
 
   ASSERT_TRUE(os::exists(slaveDir));
 
@@ -391,7 +391,7 @@ TEST_F(GarbageCollectorIntegrationTest, ExitedFramework)
   ASSERT_SOME(slave);
 
   AWAIT_READY(slaveRegisteredMessage);
-  SlaveID slaveId = slaveRegisteredMessage.get().slave_id();
+  SlaveID slaveId = slaveRegisteredMessage->slave_id();
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
@@ -403,8 +403,8 @@ TEST_F(GarbageCollectorIntegrationTest, ExitedFramework)
     .WillOnce(SaveArg<1>(&frameworkId));
 
   Resources resources = Resources::parse(flags.resources.get()).get();
-  double cpus = resources.get<Value::Scalar>("cpus").get().value();
-  double mem = resources.get<Value::Scalar>("mem").get().value();
+  double cpus = resources.get<Value::Scalar>("cpus")->value();
+  double mem = resources.get<Value::Scalar>("mem")->value();
 
   EXPECT_CALL(sched, resourceOffers(_, _))
     .WillOnce(LaunchTasks(DEFAULT_EXECUTOR_INFO, 1, cpus, mem, "*"))
@@ -440,7 +440,7 @@ TEST_F(GarbageCollectorIntegrationTest, ExitedFramework)
 
   AWAIT_READY(status);
 
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   Future<Nothing> shutdown;
   EXPECT_CALL(exec, shutdown(_))
@@ -511,7 +511,7 @@ TEST_F(GarbageCollectorIntegrationTest, ExitedExecutor)
   ASSERT_SOME(slave);
 
   AWAIT_READY(slaveRegisteredMessage);
-  SlaveID slaveId = slaveRegisteredMessage.get().slave_id();
+  SlaveID slaveId = slaveRegisteredMessage->slave_id();
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
@@ -522,8 +522,8 @@ TEST_F(GarbageCollectorIntegrationTest, ExitedExecutor)
     .WillOnce(FutureArg<1>(&frameworkId));
 
   Resources resources = Resources::parse(flags.resources.get()).get();
-  double cpus = resources.get<Value::Scalar>("cpus").get().value();
-  double mem = resources.get<Value::Scalar>("mem").get().value();
+  double cpus = resources.get<Value::Scalar>("cpus")->value();
+  double mem = resources.get<Value::Scalar>("mem")->value();
 
   EXPECT_CALL(sched, resourceOffers(_, _))
     .WillOnce(LaunchTasks(DEFAULT_EXECUTOR_INFO, 1, cpus, mem, "*"))
@@ -548,7 +548,7 @@ TEST_F(GarbageCollectorIntegrationTest, ExitedExecutor)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   const string& executorDir = slave::paths::getExecutorPath(
       flags.work_dir, slaveId, frameworkId.get(), DEFAULT_EXECUTOR_ID);
@@ -620,7 +620,7 @@ TEST_F(GarbageCollectorIntegrationTest, DiskUsage)
   ASSERT_SOME(slave);
 
   AWAIT_READY(slaveRegisteredMessage);
-  SlaveID slaveId = slaveRegisteredMessage.get().slave_id();
+  SlaveID slaveId = slaveRegisteredMessage->slave_id();
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
@@ -631,8 +631,8 @@ TEST_F(GarbageCollectorIntegrationTest, DiskUsage)
     .WillOnce(FutureArg<1>(&frameworkId));
 
   Resources resources = Resources::parse(flags.resources.get()).get();
-  double cpus = resources.get<Value::Scalar>("cpus").get().value();
-  double mem = resources.get<Value::Scalar>("mem").get().value();
+  double cpus = resources.get<Value::Scalar>("cpus")->value();
+  double mem = resources.get<Value::Scalar>("mem")->value();
 
   EXPECT_CALL(sched, resourceOffers(_, _))
     .WillOnce(LaunchTasks(DEFAULT_EXECUTOR_INFO, 1, cpus, mem, "*"))
@@ -652,7 +652,7 @@ TEST_F(GarbageCollectorIntegrationTest, DiskUsage)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   const string& executorDir = slave::paths::getExecutorPath(
       flags.work_dir, slaveId, frameworkId.get(), DEFAULT_EXECUTOR_ID);
@@ -762,8 +762,8 @@ TEST_F(GarbageCollectorIntegrationTest, Unschedule)
     .WillOnce(FutureArg<1>(&frameworkId));
 
   Resources resources = Resources::parse(flags.resources.get()).get();
-  double cpus = resources.get<Value::Scalar>("cpus").get().value();
-  double mem = resources.get<Value::Scalar>("mem").get().value();
+  double cpus = resources.get<Value::Scalar>("cpus")->value();
+  double mem = resources.get<Value::Scalar>("mem")->value();
 
   EXPECT_CALL(sched, resourceOffers(_, _))
     .WillOnce(LaunchTasks(executor1, 1, cpus, mem, "*"));
@@ -783,7 +783,7 @@ TEST_F(GarbageCollectorIntegrationTest, Unschedule)
 
   AWAIT_READY(status);
 
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   // TODO(benh/vinod): Would've been great to match the dispatch
   // against arguments here.
@@ -888,7 +888,7 @@ TEST_F(GarbageCollectorIntegrationTest, ROOT_BusyMountPoint)
 
   AWAIT_READY(frameworkId);
   AWAIT_READY(offers);
-  EXPECT_FALSE(offers.get().empty());
+  EXPECT_FALSE(offers->empty());
 
   const Offer& offer = offers.get()[0];
   const SlaveID& slaveId = offer.slave_id();
@@ -921,8 +921,8 @@ TEST_F(GarbageCollectorIntegrationTest, ROOT_BusyMountPoint)
   driver.launchTasks(offer.id(), {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());
 
   ExecutorID executorId;
   executorId.set_value("test-task123");
@@ -947,8 +947,8 @@ TEST_F(GarbageCollectorIntegrationTest, ROOT_BusyMountPoint)
   ASSERT_TRUE(os::exists(path::join(sandbox, regularFile)));
 
   AWAIT_READY(status2);
-  ASSERT_EQ(task.task_id(), status2.get().task_id());
-  EXPECT_EQ(TASK_FINISHED, status2.get().state());
+  ASSERT_EQ(task.task_id(), status2->task_id());
+  EXPECT_EQ(TASK_FINISHED, status2->state());
 
   AWAIT_READY(schedule);
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/group_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/group_tests.cpp b/src/tests/group_tests.cpp
index 193a158..f2e37cc 100644
--- a/src/tests/group_tests.cpp
+++ b/src/tests/group_tests.cpp
@@ -59,8 +59,8 @@ TEST_F(GroupTest, Group)
   Future<set<Group::Membership>> memberships = group.watch();
 
   AWAIT_READY(memberships);
-  EXPECT_EQ(1u, memberships.get().size());
-  EXPECT_EQ(1u, memberships.get().count(membership.get()));
+  EXPECT_EQ(1u, memberships->size());
+  EXPECT_EQ(1u, memberships->count(membership.get()));
 
   Future<Option<string>> data = group.data(membership.get());
 
@@ -74,10 +74,10 @@ TEST_F(GroupTest, Group)
   memberships = group.watch(memberships.get());
 
   AWAIT_READY(memberships);
-  EXPECT_EQ(0u, memberships.get().size());
+  EXPECT_EQ(0u, memberships->size());
 
-  ASSERT_TRUE(membership.get().cancelled().isReady());
-  ASSERT_TRUE(membership.get().cancelled().get());
+  ASSERT_TRUE(membership->cancelled().isReady());
+  ASSERT_TRUE(membership->cancelled().get());
 }
 
 
@@ -98,8 +98,8 @@ TEST_F(GroupTest, GroupJoinWithDisconnect)
   Future<set<Group::Membership>> memberships = group.watch();
 
   AWAIT_READY(memberships);
-  EXPECT_EQ(1u, memberships.get().size());
-  EXPECT_EQ(1u, memberships.get().count(membership.get()));
+  EXPECT_EQ(1u, memberships->size());
+  EXPECT_EQ(1u, memberships->count(membership.get()));
 }
 
 
@@ -114,8 +114,8 @@ TEST_F(GroupTest, GroupDataWithDisconnect)
   Future<set<Group::Membership>> memberships = group.watch();
 
   AWAIT_READY(memberships);
-  EXPECT_EQ(1u, memberships.get().size());
-  EXPECT_EQ(1u, memberships.get().count(membership.get()));
+  EXPECT_EQ(1u, memberships->size());
+  EXPECT_EQ(1u, memberships->count(membership.get()));
 
   server->shutdownNetwork();
 
@@ -141,8 +141,8 @@ TEST_F(GroupTest, GroupDataWithRemovedMembership)
   Future<set<Group::Membership>> memberships = group.watch();
 
   AWAIT_READY(memberships);
-  EXPECT_EQ(1u, memberships.get().size());
-  EXPECT_EQ(1u, memberships.get().count(membership.get()));
+  EXPECT_EQ(1u, memberships->size());
+  EXPECT_EQ(1u, memberships->count(membership.get()));
 
   AWAIT_EXPECT_TRUE(group.cancel(membership.get()));
 
@@ -164,8 +164,8 @@ TEST_F(GroupTest, GroupCancelWithDisconnect)
   Future<set<Group::Membership>> memberships = group.watch();
 
   AWAIT_READY(memberships);
-  EXPECT_EQ(1u, memberships.get().size());
-  EXPECT_EQ(1u, memberships.get().count(membership.get()));
+  EXPECT_EQ(1u, memberships->size());
+  EXPECT_EQ(1u, memberships->count(membership.get()));
 
   Future<Option<string>> data = group.data(membership.get());
 
@@ -185,10 +185,10 @@ TEST_F(GroupTest, GroupCancelWithDisconnect)
   memberships = group.watch(memberships.get());
 
   AWAIT_READY(memberships);
-  EXPECT_EQ(0u, memberships.get().size());
+  EXPECT_EQ(0u, memberships->size());
 
-  ASSERT_TRUE(membership.get().cancelled().isReady());
-  ASSERT_TRUE(membership.get().cancelled().get());
+  ASSERT_TRUE(membership->cancelled().isReady());
+  ASSERT_TRUE(membership->cancelled().get());
 }
 
 
@@ -203,8 +203,8 @@ TEST_F(GroupTest, GroupWatchWithSessionExpiration)
   Future<set<Group::Membership>> memberships = group.watch();
 
   AWAIT_READY(memberships);
-  EXPECT_EQ(1u, memberships.get().size());
-  EXPECT_EQ(1u, memberships.get().count(membership.get()));
+  EXPECT_EQ(1u, memberships->size());
+  EXPECT_EQ(1u, memberships->count(membership.get()));
 
   Future<Option<int64_t>> session = group.session();
 
@@ -213,13 +213,13 @@ TEST_F(GroupTest, GroupWatchWithSessionExpiration)
 
   memberships = group.watch(memberships.get());
 
-  server->expireSession(session.get().get());
+  server->expireSession(session->get());
 
   AWAIT_READY(memberships);
-  EXPECT_EQ(0u, memberships.get().size());
+  EXPECT_EQ(0u, memberships->size());
 
-  AWAIT_READY(membership.get().cancelled());
-  ASSERT_FALSE(membership.get().cancelled().get());
+  AWAIT_READY(membership->cancelled());
+  ASSERT_FALSE(membership->cancelled().get());
 }
 
 
@@ -243,28 +243,28 @@ TEST_F(GroupTest, MultipleGroups)
   // NOTE: Since 'group2' joining doesn't guarantee that 'group1'
   // knows about it synchronously, we have to ensure that 'group1'
   // knows about both the memberships.
-  if (memberships1.get().size() == 1) {
+  if (memberships1->size() == 1) {
     memberships1 = group1.watch(memberships1.get());
     AWAIT_READY(memberships1);
   }
 
-  EXPECT_EQ(2u, memberships1.get().size());
-  EXPECT_EQ(1u, memberships1.get().count(membership1.get()));
-  EXPECT_EQ(1u, memberships1.get().count(membership2.get()));
+  EXPECT_EQ(2u, memberships1->size());
+  EXPECT_EQ(1u, memberships1->count(membership1.get()));
+  EXPECT_EQ(1u, memberships1->count(membership2.get()));
 
   Future<set<Group::Membership>> memberships2 = group2.watch();
 
   AWAIT_READY(memberships2);
 
   // See comments above for why we need to do this.
-  if (memberships2.get().size() == 1) {
+  if (memberships2->size() == 1) {
     memberships2 = group2.watch(memberships2.get());
     AWAIT_READY(memberships2);
   }
 
-  EXPECT_EQ(2u, memberships2.get().size());
-  EXPECT_EQ(1u, memberships2.get().count(membership1.get()));
-  EXPECT_EQ(1u, memberships2.get().count(membership2.get()));
+  EXPECT_EQ(2u, memberships2->size());
+  EXPECT_EQ(1u, memberships2->count(membership1.get()));
+  EXPECT_EQ(1u, memberships2->count(membership2.get()));
 
   Future<bool> cancelled;
 
@@ -281,7 +281,7 @@ TEST_F(GroupTest, MultipleGroups)
   AWAIT_READY(session1);
   ASSERT_SOME(session1.get());
 
-  server->expireSession(session1.get().get());
+  server->expireSession(session1->get());
 
   AWAIT_ASSERT_FALSE(cancelled);
 }
@@ -363,7 +363,7 @@ TEST_F(GroupTest, RetryableErrors)
   // on-going. This causes retries of authenticate() and group
   // create().
   connected = FUTURE_DISPATCH(_, &GroupProcess::connected);
-  server->expireSession(session.get().get());
+  server->expireSession(session->get());
 
   Future<Group::Membership> membership = group.join("hello world");
 
@@ -373,7 +373,7 @@ TEST_F(GroupTest, RetryableErrors)
   AWAIT_READY(session);
   ASSERT_SOME(session.get());
   connected = FUTURE_DISPATCH(_, &GroupProcess::connected);
-  server->expireSession(session.get().get());
+  server->expireSession(session->get());
 
   AWAIT_READY(membership);
 
@@ -383,7 +383,7 @@ TEST_F(GroupTest, RetryableErrors)
   AWAIT_READY(session);
   ASSERT_SOME(session.get());
   connected = FUTURE_DISPATCH(_, &GroupProcess::connected);
-  server->expireSession(session.get().get());
+  server->expireSession(session->get());
 
   Future<bool> cancellation = group.cancel(membership.get());
 
@@ -393,7 +393,7 @@ TEST_F(GroupTest, RetryableErrors)
   AWAIT_READY(session);
   ASSERT_SOME(session.get());
   connected = FUTURE_DISPATCH(_, &GroupProcess::connected);
-  server->expireSession(session.get().get());
+  server->expireSession(session->get());
 
   AWAIT_READY(cancellation);
   AWAIT_READY(connected);
@@ -413,8 +413,8 @@ TEST_F(GroupTest, LabelledGroup)
   Future<set<Group::Membership>> memberships = group.watch();
 
   AWAIT_READY(memberships);
-  EXPECT_EQ(1u, memberships.get().size());
-  EXPECT_EQ(1u, memberships.get().count(membership.get()));
+  EXPECT_EQ(1u, memberships->size());
+  EXPECT_EQ(1u, memberships->count(membership.get()));
 
   Future<Option<string>> data = group.data(membership.get());
 
@@ -428,10 +428,10 @@ TEST_F(GroupTest, LabelledGroup)
   memberships = group.watch(memberships.get());
 
   AWAIT_READY(memberships);
-  EXPECT_EQ(0u, memberships.get().size());
+  EXPECT_EQ(0u, memberships->size());
 
-  ASSERT_TRUE(membership.get().cancelled().isReady());
-  ASSERT_TRUE(membership.get().cancelled().get());
+  ASSERT_TRUE(membership->cancelled().isReady());
+  ASSERT_TRUE(membership->cancelled().get());
 }
 
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/health_check_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/health_check_tests.cpp b/src/tests/health_check_tests.cpp
index 56e9074..fc1c828 100644
--- a/src/tests/health_check_tests.cpp
+++ b/src/tests/health_check_tests.cpp
@@ -298,7 +298,7 @@ TEST_F(HealthCheckTest, HealthyTask)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   vector<TaskInfo> tasks =
     populateTasks(SLEEP_COMMAND(120), "exit 0", offers.get()[0]);
@@ -313,12 +313,12 @@ TEST_F(HealthCheckTest, HealthyTask)
   driver.launchTasks(offers.get()[0].id(), tasks);
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusHealthy);
-  EXPECT_EQ(TASK_RUNNING, statusHealthy.get().state());
-  EXPECT_TRUE(statusHealthy.get().has_healthy());
-  EXPECT_TRUE(statusHealthy.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusHealthy->state());
+  EXPECT_TRUE(statusHealthy->has_healthy());
+  EXPECT_TRUE(statusHealthy->healthy());
 
   Future<TaskStatus> explicitReconciliation;
   EXPECT_CALL(sched, statusUpdate(&driver, _))
@@ -328,7 +328,7 @@ TEST_F(HealthCheckTest, HealthyTask)
   TaskStatus status;
 
   // Send a task status to trigger explicit reconciliation.
-  const TaskID taskId = statusHealthy.get().task_id();
+  const TaskID taskId = statusHealthy->task_id();
   status.mutable_task_id()->CopyFrom(taskId);
 
   // State is not checked by reconciliation, but is required to be
@@ -338,9 +338,9 @@ TEST_F(HealthCheckTest, HealthyTask)
   driver.reconcileTasks(statuses);
 
   AWAIT_READY(explicitReconciliation);
-  EXPECT_EQ(TASK_RUNNING, explicitReconciliation.get().state());
-  EXPECT_TRUE(explicitReconciliation.get().has_healthy());
-  EXPECT_TRUE(explicitReconciliation.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, explicitReconciliation->state());
+  EXPECT_TRUE(explicitReconciliation->has_healthy());
+  EXPECT_TRUE(explicitReconciliation->healthy());
 
   Future<TaskStatus> implicitReconciliation;
   EXPECT_CALL(sched, statusUpdate(&driver, _))
@@ -352,9 +352,9 @@ TEST_F(HealthCheckTest, HealthyTask)
   driver.reconcileTasks(statuses);
 
   AWAIT_READY(implicitReconciliation);
-  EXPECT_EQ(TASK_RUNNING, implicitReconciliation.get().state());
-  EXPECT_TRUE(implicitReconciliation.get().has_healthy());
-  EXPECT_TRUE(implicitReconciliation.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, implicitReconciliation->state());
+  EXPECT_TRUE(implicitReconciliation->has_healthy());
+  EXPECT_TRUE(implicitReconciliation->healthy());
 
   // Verify that task health is exposed in the master's state endpoint.
   {
@@ -366,10 +366,10 @@ TEST_F(HealthCheckTest, HealthyTask)
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(process::http::OK().status, 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);
 
-    Result<JSON::Value> find = parse.get().find<JSON::Value>(
+    Result<JSON::Value> find = parse->find<JSON::Value>(
         "frameworks[0].tasks[0].statuses[0].healthy");
     EXPECT_SOME_TRUE(find);
   }
@@ -384,10 +384,10 @@ TEST_F(HealthCheckTest, HealthyTask)
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(process::http::OK().status, 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);
 
-    Result<JSON::Value> find = parse.get().find<JSON::Value>(
+    Result<JSON::Value> find = parse->find<JSON::Value>(
         "frameworks[0].executors[0].tasks[0].statuses[0].healthy");
     EXPECT_SOME_TRUE(find);
   }
@@ -438,7 +438,7 @@ TEST_F(HealthCheckTest, ROOT_HealthyTaskWithContainerImage)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Make use of 'populateTasks()' to avoid duplicate code.
   vector<TaskInfo> tasks =
@@ -468,12 +468,12 @@ TEST_F(HealthCheckTest, ROOT_HealthyTaskWithContainerImage)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusHealthy);
-  EXPECT_EQ(TASK_RUNNING, statusHealthy.get().state());
-  EXPECT_TRUE(statusHealthy.get().has_healthy());
-  EXPECT_TRUE(statusHealthy.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusHealthy->state());
+  EXPECT_TRUE(statusHealthy->has_healthy());
+  EXPECT_TRUE(statusHealthy->healthy());
 
   // Verify that task health is exposed in the master's state endpoint.
   {
@@ -485,10 +485,10 @@ TEST_F(HealthCheckTest, ROOT_HealthyTaskWithContainerImage)
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(process::http::OK().status, 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);
 
-    Result<JSON::Value> find = parse.get().find<JSON::Value>(
+    Result<JSON::Value> find = parse->find<JSON::Value>(
         "frameworks[0].tasks[0].statuses[0].healthy");
     EXPECT_SOME_TRUE(find);
   }
@@ -503,10 +503,10 @@ TEST_F(HealthCheckTest, ROOT_HealthyTaskWithContainerImage)
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(process::http::OK().status, 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);
 
-    Result<JSON::Value> find = parse.get().find<JSON::Value>(
+    Result<JSON::Value> find = parse->find<JSON::Value>(
         "frameworks[0].executors[0].tasks[0].statuses[0].healthy");
     EXPECT_SOME_TRUE(find);
   }
@@ -570,7 +570,7 @@ TEST_F(HealthCheckTest, ROOT_DOCKER_DockerHealthyTask)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   ContainerInfo containerInfo;
   containerInfo.set_type(ContainerInfo::DOCKER);
@@ -607,12 +607,12 @@ TEST_F(HealthCheckTest, ROOT_DOCKER_DockerHealthyTask)
   AWAIT_READY(containerId);
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusHealthy);
-  EXPECT_EQ(TASK_RUNNING, statusHealthy.get().state());
-  EXPECT_TRUE(statusHealthy.get().has_healthy());
-  EXPECT_TRUE(statusHealthy.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusHealthy->state());
+  EXPECT_TRUE(statusHealthy->has_healthy());
+  EXPECT_TRUE(statusHealthy->healthy());
 
   Future<Option<ContainerTermination>> termination =
     containerizer.wait(containerId.get());
@@ -662,7 +662,7 @@ TEST_F(HealthCheckTest, HealthyTaskNonShell)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   CommandInfo command;
   command.set_shell(false);
@@ -682,11 +682,11 @@ TEST_F(HealthCheckTest, HealthyTaskNonShell)
   driver.launchTasks(offers.get()[0].id(), tasks);
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusHealthy);
-  EXPECT_EQ(TASK_RUNNING, statusHealthy.get().state());
-  EXPECT_TRUE(statusHealthy.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusHealthy->state());
+  EXPECT_TRUE(statusHealthy->healthy());
 
   driver.stop();
   driver.join();
@@ -718,7 +718,7 @@ TEST_F(HealthCheckTest, HealthStatusChange)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Create a temporary file.
   Try<string> temporaryPath = os::mktemp(path::join(os::getcwd(), "XXXXXX"));
@@ -747,19 +747,19 @@ TEST_F(HealthCheckTest, HealthStatusChange)
   driver.launchTasks(offers.get()[0].id(), tasks);
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusHealthy);
-  EXPECT_EQ(TASK_RUNNING, statusHealthy.get().state());
-  EXPECT_TRUE(statusHealthy.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusHealthy->state());
+  EXPECT_TRUE(statusHealthy->healthy());
 
   AWAIT_READY(statusUnhealthy);
-  EXPECT_EQ(TASK_RUNNING, statusUnhealthy.get().state());
-  EXPECT_FALSE(statusUnhealthy.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusUnhealthy->state());
+  EXPECT_FALSE(statusUnhealthy->healthy());
 
   AWAIT_READY(statusHealthyAgain);
-  EXPECT_EQ(TASK_RUNNING, statusHealthyAgain.get().state());
-  EXPECT_TRUE(statusHealthyAgain.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusHealthyAgain->state());
+  EXPECT_TRUE(statusHealthyAgain->healthy());
 
   driver.stop();
   driver.join();
@@ -820,7 +820,7 @@ TEST_F(HealthCheckTest, ROOT_DOCKER_DockerHealthStatusChange)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   ContainerInfo containerInfo;
   containerInfo.set_type(ContainerInfo::DOCKER);
@@ -879,19 +879,19 @@ TEST_F(HealthCheckTest, ROOT_DOCKER_DockerHealthStatusChange)
   driver.launchTasks(offers.get()[0].id(), tasks);
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusUnhealthy);
-  EXPECT_EQ(TASK_RUNNING, statusUnhealthy.get().state());
-  EXPECT_FALSE(statusUnhealthy.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusUnhealthy->state());
+  EXPECT_FALSE(statusUnhealthy->healthy());
 
   AWAIT_READY(statusHealthy);
-  EXPECT_EQ(TASK_RUNNING, statusHealthy.get().state());
-  EXPECT_TRUE(statusHealthy.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusHealthy->state());
+  EXPECT_TRUE(statusHealthy->healthy());
 
   AWAIT_READY(statusUnhealthyAgain);
-  EXPECT_EQ(TASK_RUNNING, statusUnhealthyAgain.get().state());
-  EXPECT_FALSE(statusUnhealthyAgain.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusUnhealthyAgain->state());
+  EXPECT_FALSE(statusUnhealthyAgain->healthy());
 
   // Check the temporary file created in host still
   // exists and the content has not changed.
@@ -947,7 +947,7 @@ TEST_F(HealthCheckTest, ConsecutiveFailures)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   vector<TaskInfo> tasks = populateTasks(
     SLEEP_COMMAND(120), "exit 1", offers.get()[0], 0, 4);
@@ -971,28 +971,28 @@ TEST_F(HealthCheckTest, ConsecutiveFailures)
   driver.launchTasks(offers.get()[0].id(), tasks);
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(status1);
-  EXPECT_EQ(TASK_RUNNING, status1.get().state());
-  EXPECT_FALSE(status1.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, status1->state());
+  EXPECT_FALSE(status1->healthy());
 
   AWAIT_READY(status2);
-  EXPECT_EQ(TASK_RUNNING, status2.get().state());
-  EXPECT_FALSE(status2.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, status2->state());
+  EXPECT_FALSE(status2->healthy());
 
   AWAIT_READY(status3);
-  EXPECT_EQ(TASK_RUNNING, status3.get().state());
-  EXPECT_FALSE(status3.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, status3->state());
+  EXPECT_FALSE(status3->healthy());
 
   AWAIT_READY(status4);
-  EXPECT_EQ(TASK_RUNNING, status4.get().state());
-  EXPECT_FALSE(status4.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, status4->state());
+  EXPECT_FALSE(status4->healthy());
 
   AWAIT_READY(statusKilled);
-  EXPECT_EQ(TASK_KILLED, statusKilled.get().state());
-  EXPECT_TRUE(statusKilled.get().has_healthy());
-  EXPECT_FALSE(statusKilled.get().healthy());
+  EXPECT_EQ(TASK_KILLED, statusKilled->state());
+  EXPECT_TRUE(statusKilled->has_healthy());
+  EXPECT_FALSE(statusKilled->healthy());
 
   driver.stop();
   driver.join();
@@ -1024,7 +1024,7 @@ TEST_F(HealthCheckTest, EnvironmentSetup)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   map<string, string> env;
   env["STATUS"] = "0";
@@ -1042,11 +1042,11 @@ TEST_F(HealthCheckTest, EnvironmentSetup)
   driver.launchTasks(offers.get()[0].id(), tasks);
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusHealthy);
-  EXPECT_EQ(TASK_RUNNING, statusHealthy.get().state());
-  EXPECT_TRUE(statusHealthy.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusHealthy->state());
+  EXPECT_TRUE(statusHealthy->healthy());
 
   driver.stop();
   driver.join();
@@ -1077,7 +1077,7 @@ TEST_F(HealthCheckTest, GracePeriod)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // The health check for this task will always fail, but the grace period of
   // 9999 seconds should mask the failures.
@@ -1095,13 +1095,13 @@ TEST_F(HealthCheckTest, GracePeriod)
   driver.launchTasks(offers.get()[0].id(), tasks);
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
-  EXPECT_FALSE(statusRunning.get().has_healthy());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
+  EXPECT_FALSE(statusRunning->has_healthy());
 
   // No task unhealthy update should be called in grace period.
   AWAIT_READY(statusFinished);
-  EXPECT_EQ(TASK_FINISHED, statusFinished.get().state());
-  EXPECT_FALSE(statusFinished.get().has_healthy());
+  EXPECT_EQ(TASK_FINISHED, statusFinished->state());
+  EXPECT_FALSE(statusFinished->has_healthy());
 
   driver.stop();
   driver.join();
@@ -1133,7 +1133,7 @@ TEST_F(HealthCheckTest, CheckCommandTimeout)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   vector<TaskInfo> tasks = populateTasks(
       SLEEP_COMMAND(120),
@@ -1158,16 +1158,16 @@ TEST_F(HealthCheckTest, CheckCommandTimeout)
   driver.launchTasks(offers.get()[0].id(), tasks);
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusUnhealthy);
-  EXPECT_EQ(TASK_RUNNING, statusUnhealthy.get().state());
-  EXPECT_FALSE(statusUnhealthy.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusUnhealthy->state());
+  EXPECT_FALSE(statusUnhealthy->healthy());
 
   AWAIT_READY(statusKilled);
-  EXPECT_EQ(TASK_KILLED, statusKilled.get().state());
-  EXPECT_TRUE(statusKilled.get().has_healthy());
-  EXPECT_FALSE(statusKilled.get().healthy());
+  EXPECT_EQ(TASK_KILLED, statusKilled->state());
+  EXPECT_TRUE(statusKilled->has_healthy());
+  EXPECT_FALSE(statusKilled->healthy());
 
   driver.stop();
   driver.join();
@@ -1202,7 +1202,7 @@ TEST_F(HealthCheckTest, HealthyToUnhealthyTransitionWithinGracePeriod)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Create a temporary file.
   const string tmpPath = path::join(os::getcwd(), "healthyToUnhealthy");
@@ -1227,17 +1227,17 @@ TEST_F(HealthCheckTest, HealthyToUnhealthyTransitionWithinGracePeriod)
   driver.launchTasks(offers.get()[0].id(), tasks);
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusHealthy);
-  EXPECT_EQ(TASK_RUNNING, statusHealthy.get().state());
-  EXPECT_TRUE(statusHealthy.get().has_healthy());
-  EXPECT_TRUE(statusHealthy.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusHealthy->state());
+  EXPECT_TRUE(statusHealthy->has_healthy());
+  EXPECT_TRUE(statusHealthy->healthy());
 
   AWAIT_READY(statusUnhealthy);
-  EXPECT_EQ(TASK_RUNNING, statusUnhealthy.get().state());
-  EXPECT_TRUE(statusUnhealthy.get().has_healthy());
-  EXPECT_FALSE(statusUnhealthy.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusUnhealthy->state());
+  EXPECT_TRUE(statusUnhealthy->has_healthy());
+  EXPECT_FALSE(statusUnhealthy->healthy());
 
   driver.stop();
   driver.join();
@@ -1270,7 +1270,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HealthCheckTest, HealthyTaskViaHTTP)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   const uint16_t testPort = getFreePort().get();
 
@@ -1307,12 +1307,12 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HealthCheckTest, HealthyTaskViaHTTP)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusHealthy);
-  EXPECT_EQ(TASK_RUNNING, statusHealthy.get().state());
-  EXPECT_TRUE(statusHealthy.get().has_healthy());
-  EXPECT_TRUE(statusHealthy.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusHealthy->state());
+  EXPECT_TRUE(statusHealthy->has_healthy());
+  EXPECT_TRUE(statusHealthy->healthy());
 
   driver.stop();
   driver.join();
@@ -1355,7 +1355,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HealthCheckTest, HealthyTaskViaHTTPWithoutType)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   const uint16_t testPort = getFreePort().get();
 
@@ -1391,12 +1391,12 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HealthCheckTest, HealthyTaskViaHTTPWithoutType)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusHealthy);
-  EXPECT_EQ(TASK_RUNNING, statusHealthy.get().state());
-  EXPECT_TRUE(statusHealthy.get().has_healthy());
-  EXPECT_TRUE(statusHealthy.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusHealthy->state());
+  EXPECT_TRUE(statusHealthy->has_healthy());
+  EXPECT_TRUE(statusHealthy->healthy());
 
   driver.stop();
   driver.join();
@@ -1432,7 +1432,7 @@ TEST_F(HealthCheckTest, HealthyTaskViaTCP)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   const uint16_t testPort = getFreePort().get();
 
@@ -1468,12 +1468,12 @@ TEST_F(HealthCheckTest, HealthyTaskViaTCP)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusHealthy);
-  EXPECT_EQ(TASK_RUNNING, statusHealthy.get().state());
-  EXPECT_TRUE(statusHealthy.get().has_healthy());
-  EXPECT_TRUE(statusHealthy.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusHealthy->state());
+  EXPECT_TRUE(statusHealthy->has_healthy());
+  EXPECT_TRUE(statusHealthy->healthy());
 
   driver.stop();
   driver.join();
@@ -1512,7 +1512,7 @@ TEST_F(HealthCheckTest, ROOT_INTERNET_CURL_HealthyTaskViaHTTPWithContainerImage)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   const uint16_t testPort = getFreePort().get();
 
@@ -1553,12 +1553,12 @@ TEST_F(HealthCheckTest, ROOT_INTERNET_CURL_HealthyTaskViaHTTPWithContainerImage)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusHealthy);
-  EXPECT_EQ(TASK_RUNNING, statusHealthy.get().state());
-  EXPECT_TRUE(statusHealthy.get().has_healthy());
-  EXPECT_TRUE(statusHealthy.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusHealthy->state());
+  EXPECT_TRUE(statusHealthy->has_healthy());
+  EXPECT_TRUE(statusHealthy->healthy());
 
   driver.stop();
   driver.join();
@@ -1597,7 +1597,7 @@ TEST_F(HealthCheckTest,
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   const uint16_t testPort = getFreePort().get();
 
@@ -1641,12 +1641,12 @@ TEST_F(HealthCheckTest,
 
   // Increase time here to wait for pulling image finish.
   AWAIT_READY_FOR(statusRunning, Seconds(60));
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusHealthy);
-  EXPECT_EQ(TASK_RUNNING, statusHealthy.get().state());
-  EXPECT_TRUE(statusHealthy.get().has_healthy());
-  EXPECT_TRUE(statusHealthy.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusHealthy->state());
+  EXPECT_TRUE(statusHealthy->has_healthy());
+  EXPECT_TRUE(statusHealthy->healthy());
 
   driver.stop();
   driver.join();
@@ -1689,7 +1689,7 @@ TEST_F(HealthCheckTest, ROOT_INTERNET_CURL_HealthyTaskViaTCPWithContainerImage)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   const uint16_t testPort = getFreePort().get();
 
@@ -1730,12 +1730,12 @@ TEST_F(HealthCheckTest, ROOT_INTERNET_CURL_HealthyTaskViaTCPWithContainerImage)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusHealthy);
-  EXPECT_EQ(TASK_RUNNING, statusHealthy.get().state());
-  EXPECT_TRUE(statusHealthy.get().has_healthy());
-  EXPECT_TRUE(statusHealthy.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusHealthy->state());
+  EXPECT_TRUE(statusHealthy->has_healthy());
+  EXPECT_TRUE(statusHealthy->healthy());
 
   driver.stop();
   driver.join();
@@ -1785,7 +1785,7 @@ TEST_F(HealthCheckTest, ROOT_DOCKER_DockerHealthyTaskViaHTTP)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   const uint16_t testPort = getFreePort().get();
 
@@ -1837,12 +1837,12 @@ TEST_F(HealthCheckTest, ROOT_DOCKER_DockerHealthyTaskViaHTTP)
   AWAIT_READY(containerId);
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusHealthy);
-  EXPECT_EQ(TASK_RUNNING, statusHealthy.get().state());
-  EXPECT_TRUE(statusHealthy.get().has_healthy());
-  EXPECT_TRUE(statusHealthy.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusHealthy->state());
+  EXPECT_TRUE(statusHealthy->has_healthy());
+  EXPECT_TRUE(statusHealthy->healthy());
 
   Future<Option<ContainerTermination>> termination =
     containerizer.wait(containerId.get());
@@ -1912,7 +1912,7 @@ TEST_F(HealthCheckTest, ROOT_DOCKER_DockerHealthyTaskViaHTTPS)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   const uint16_t testPort = getFreePort().get();
 
@@ -1967,12 +1967,12 @@ TEST_F(HealthCheckTest, ROOT_DOCKER_DockerHealthyTaskViaHTTPS)
 
   // Increase time here to wait for pulling image finish.
   AWAIT_READY_FOR(statusRunning, Seconds(60));
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusHealthy);
-  EXPECT_EQ(TASK_RUNNING, statusHealthy.get().state());
-  EXPECT_TRUE(statusHealthy.get().has_healthy());
-  EXPECT_TRUE(statusHealthy.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusHealthy->state());
+  EXPECT_TRUE(statusHealthy->has_healthy());
+  EXPECT_TRUE(statusHealthy->healthy());
 
   Future<Option<ContainerTermination>> termination =
     containerizer.wait(containerId.get());
@@ -2044,7 +2044,7 @@ TEST_F(HealthCheckTest, ROOT_DOCKER_DockerHealthyTaskViaTCP)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   const uint16_t testPort = getFreePort().get();
 
@@ -2096,12 +2096,12 @@ TEST_F(HealthCheckTest, ROOT_DOCKER_DockerHealthyTaskViaTCP)
   AWAIT_READY(containerId);
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusHealthy);
-  EXPECT_EQ(TASK_RUNNING, statusHealthy.get().state());
-  EXPECT_TRUE(statusHealthy.get().has_healthy());
-  EXPECT_TRUE(statusHealthy.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusHealthy->state());
+  EXPECT_TRUE(statusHealthy->has_healthy());
+  EXPECT_TRUE(statusHealthy->healthy());
 
   Future<Option<ContainerTermination>> termination =
     containerizer.wait(containerId.get());

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/hook_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/hook_tests.cpp b/src/tests/hook_tests.cpp
index 95dcfb6..71e619c 100644
--- a/src/tests/hook_tests.cpp
+++ b/src/tests/hook_tests.cpp
@@ -175,7 +175,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HookTest, VerifyMasterLaunchTaskHook)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("");
@@ -213,7 +213,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HookTest, VerifyMasterLaunchTaskHook)
   // hook module has stripped the first 'testRemoveLabelKey' label.
   // We do this by ensuring that only one label is present and that it
   // is the new 'testLabelKey' label.
-  const Labels &labels_ = runTaskMessage.get().task().labels();
+  const Labels &labels_ = runTaskMessage->task().labels();
   ASSERT_EQ(1, labels_.labels_size());
 
   EXPECT_EQ(testLabelKey, labels_.labels().Get(0).key());
@@ -373,7 +373,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HookTest, VerifySlaveLaunchExecutorHook)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Launch a task with the command executor.
   TaskInfo task;
@@ -454,7 +454,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HookTest, VerifySlaveRunTaskHook)
   driver.start();
 
   AWAIT_READY(offers);
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
 
   TaskInfo task;
   task.set_name("");
@@ -485,7 +485,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HookTest, VerifySlaveRunTaskHook)
   AWAIT_READY(taskInfo);
 
   // The master hook will hang an extra label off.
-  const Labels& labels_ = taskInfo.get().labels();
+  const Labels& labels_ = taskInfo->labels();
 
   ASSERT_EQ(3, labels_.labels_size());
 
@@ -543,7 +543,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HookTest, VerifySlaveTaskStatusDecorator)
   driver.start();
 
   AWAIT_READY(offers);
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
 
   // Start a task.
   TaskInfo task = createTask(offers.get()[0], "", DEFAULT_EXECUTOR_ID);
@@ -571,7 +571,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HookTest, VerifySlaveTaskStatusDecorator)
   // The hook also adds a new label with the same key but a different
   // value ("bar:quz").
   TaskStatus runningStatus;
-  runningStatus.mutable_task_id()->MergeFrom(execTask.get().task_id());
+  runningStatus.mutable_task_id()->MergeFrom(execTask->task_id());
   runningStatus.set_state(TASK_RUNNING);
 
   // Add two labels to the TaskStatus
@@ -585,7 +585,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HookTest, VerifySlaveTaskStatusDecorator)
   AWAIT_READY(status);
 
   // The hook will hang an extra label off.
-  const Labels& labels_ = status.get().labels();
+  const Labels& labels_ = status->labels();
 
   EXPECT_EQ(2, labels_.labels_size());
 
@@ -601,11 +601,11 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HookTest, VerifySlaveTaskStatusDecorator)
 
   // Now validate TaskInfo.container_status. We must have received a
   // container_status with one network_info set by the test hook module.
-  EXPECT_TRUE(status.get().has_container_status());
-  EXPECT_EQ(1, status.get().container_status().network_infos().size());
+  EXPECT_TRUE(status->has_container_status());
+  EXPECT_EQ(1, status->container_status().network_infos().size());
 
   const NetworkInfo networkInfo =
-    status.get().container_status().network_infos(0);
+    status->container_status().network_infos(0);
 
   // The hook module sets up '4.3.2.1' as the IP address and 'public' as the
   // network isolation group. The `ip_address` field is deprecated, but the
@@ -682,7 +682,7 @@ TEST_F(HookTest, ROOT_DOCKER_VerifySlavePreLaunchDockerTaskExecutorDecorator)
   driver.start();
 
   AWAIT_READY(offers);
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
 
   // The task should see `HOOKTEST_TASK` but not `HOOKTEST_EXECUTOR`.
   TaskInfo task = createTask(
@@ -717,9 +717,9 @@ TEST_F(HookTest, ROOT_DOCKER_VerifySlavePreLaunchDockerTaskExecutorDecorator)
 
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY_FOR(statusRunning, Seconds(60));
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
   AWAIT_READY_FOR(statusFinished, Seconds(60));
-  EXPECT_EQ(TASK_FINISHED, statusFinished.get().state());
+  EXPECT_EQ(TASK_FINISHED, statusFinished->state());
 
   Future<Option<ContainerTermination>> termination =
     containerizer.wait(containerId.get());
@@ -790,7 +790,7 @@ TEST_F(HookTest, ROOT_DOCKER_VerifySlavePreLaunchDockerValidator)
   driver.start();
 
   AWAIT_READY(offers);
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
 
   TaskInfo task;
   task.set_name("");
@@ -826,7 +826,7 @@ TEST_F(HookTest, ROOT_DOCKER_VerifySlavePreLaunchDockerValidator)
 
   AWAIT_READY(statusError);
 
-  EXPECT_EQ(TASK_FAILED, statusError.get().state());
+  EXPECT_EQ(TASK_FAILED, statusError->state());
   EXPECT_EQ(TaskStatus::REASON_CONTAINER_LAUNCH_FAILED, statusError->reason());
 
   driver.stop();
@@ -888,7 +888,7 @@ TEST_F(HookTest, ROOT_DOCKER_VerifySlavePreLaunchDockerHook)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -932,9 +932,9 @@ TEST_F(HookTest, ROOT_DOCKER_VerifySlavePreLaunchDockerHook)
 
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY_FOR(statusRunning, Seconds(60));
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
   AWAIT_READY_FOR(statusFinished, Seconds(60));
-  EXPECT_EQ(TASK_FINISHED, statusFinished.get().state());
+  EXPECT_EQ(TASK_FINISHED, statusFinished->state());
 
   Future<Option<ContainerTermination>> termination =
     containerizer.wait(containerId.get());
@@ -1045,10 +1045,10 @@ TEST_F(HookTest, ROOT_DOCKER_VerifySlavePostFetchHook)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY_FOR(statusRunning, Seconds(60));
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY_FOR(statusFinished, Seconds(60));
-  EXPECT_EQ(TASK_FINISHED, statusFinished.get().state());
+  EXPECT_EQ(TASK_FINISHED, statusFinished->state());
 
   driver.stop();
   driver.join();
@@ -1101,7 +1101,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   Resources resources = offers.get()[0].resources();
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/http_authentication_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/http_authentication_tests.cpp b/src/tests/http_authentication_tests.cpp
index d5fabf0..0eeed9d 100644
--- a/src/tests/http_authentication_tests.cpp
+++ b/src/tests/http_authentication_tests.cpp
@@ -100,7 +100,7 @@ static Parameters createBasicAuthenticatorParameters(
     Parameter* parameter = parameters.add_parameter();
     parameter->set_key("credentials");
     parameter->set_value(
-        stringify(JSON::protobuf(credentials.get().credentials())));
+        stringify(JSON::protobuf(credentials->credentials())));
   }
 
   return parameters;

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/http_fault_tolerance_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/http_fault_tolerance_tests.cpp b/src/tests/http_fault_tolerance_tests.cpp
index aca2466..4040d24 100644
--- a/src/tests/http_fault_tolerance_tests.cpp
+++ b/src/tests/http_fault_tolerance_tests.cpp
@@ -384,7 +384,7 @@ TEST_F(HttpFaultToleranceTest, SchedulerFailoverStatusUpdate)
 
   AWAIT_READY(subscribed);
 
-  v1::FrameworkID frameworkId(subscribed.get().framework_id());
+  v1::FrameworkID frameworkId(subscribed->framework_id());
 
   AWAIT_READY(offers);
   EXPECT_NE(0, offers->offers().size());
@@ -489,7 +489,7 @@ TEST_F(HttpFaultToleranceTest, SchedulerFailoverStatusUpdate)
   AWAIT_READY(disconnected);
   AWAIT_READY(subscribed);
 
-  EXPECT_EQ(frameworkId, subscribed.get().framework_id());
+  EXPECT_EQ(frameworkId, subscribed->framework_id());
 
   Clock::pause();
 
@@ -565,7 +565,7 @@ TEST_F(HttpFaultToleranceTest, SchedulerFailoverExecutorToFrameworkMessage)
 
   AWAIT_READY(subscribed);
 
-  v1::FrameworkID frameworkId(subscribed.get().framework_id());
+  v1::FrameworkID frameworkId(subscribed->framework_id());
 
   AWAIT_READY(offers);
   EXPECT_NE(0, offers->offers().size());
@@ -649,7 +649,7 @@ TEST_F(HttpFaultToleranceTest, SchedulerFailoverExecutorToFrameworkMessage)
   AWAIT_READY(disconnected);
   AWAIT_READY(subscribed);
 
-  EXPECT_EQ(frameworkId, subscribed.get().framework_id());
+  EXPECT_EQ(frameworkId, subscribed->framework_id());
 
   Future<Event::Message> message;
   EXPECT_CALL(*scheduler2, message(_, _))
@@ -737,7 +737,7 @@ TEST_F(HttpFaultToleranceTest, SchedulerFailoverFrameworkToExecutorMessage)
 
   AWAIT_READY(subscribed);
 
-  v1::FrameworkID frameworkId(subscribed.get().framework_id());
+  v1::FrameworkID frameworkId(subscribed->framework_id());
 
   AWAIT_READY(offers);
   EXPECT_NE(0, offers->offers().size());
@@ -819,7 +819,7 @@ TEST_F(HttpFaultToleranceTest, SchedulerFailoverFrameworkToExecutorMessage)
   AWAIT_READY(disconnected);
   AWAIT_READY(subscribed);
 
-  EXPECT_EQ(frameworkId, subscribed.get().framework_id());
+  EXPECT_EQ(frameworkId, subscribed->framework_id());
 
   Future<v1::executor::Event::Message> message;
   EXPECT_CALL(*executor, message(_, _))
@@ -906,7 +906,7 @@ TEST_F(HttpFaultToleranceTest, SchedulerExit)
 
   AWAIT_READY(subscribed);
 
-  v1::FrameworkID frameworkId(subscribed.get().framework_id());
+  v1::FrameworkID frameworkId(subscribed->framework_id());
 
   AWAIT_READY(offers);
   EXPECT_NE(0, offers->offers().size());


[8/8] mesos git commit: Replace `.get().` in favor of the `->` operator in tests.

Posted by bm...@apache.org.
Replace `.get().` in favor of the `->` operator in tests.

Review: https://reviews.apache.org/r/57360/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/613d3ee3
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/613d3ee3
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/613d3ee3

Branch: refs/heads/master
Commit: 613d3ee3d31dc613ccde40575d932cda4dc9e28f
Parents: f153035
Author: Jay Guo <gu...@gmail.com>
Authored: Mon Mar 13 15:11:12 2017 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Mon Mar 13 15:11:12 2017 -0700

----------------------------------------------------------------------
 src/tests/api_tests.cpp                         | 460 +++++++++----------
 src/tests/authentication_tests.cpp              |  16 +-
 src/tests/cluster.cpp                           |   8 +-
 src/tests/command_executor_tests.cpp            |  16 +-
 src/tests/container_logger_tests.cpp            |  44 +-
 src/tests/containerizer/appc_spec_tests.cpp     |   4 +-
 .../containerizer/cgroups_isolator_tests.cpp    |  98 ++--
 src/tests/containerizer/cgroups_tests.cpp       |   4 +-
 src/tests/containerizer/cni_isolator_tests.cpp  |  10 +-
 src/tests/containerizer/cpu_isolator_tests.cpp  |  16 +-
 .../docker_containerizer_tests.cpp              | 180 ++++----
 src/tests/containerizer/docker_spec_tests.cpp   |  70 +--
 src/tests/containerizer/docker_tests.cpp        |  26 +-
 .../docker_volume_isolator_tests.cpp            |  18 +-
 src/tests/containerizer/fs_tests.cpp            |  64 +--
 .../containerizer/io_switchboard_tests.cpp      |  18 +-
 .../linux_filesystem_isolator_tests.cpp         |   8 +-
 .../containerizer/memory_isolator_tests.cpp     |  10 +-
 .../containerizer/memory_pressure_tests.cpp     |  40 +-
 .../containerizer/mesos_containerizer_tests.cpp |   2 +-
 .../nested_mesos_containerizer_tests.cpp        |   2 +-
 src/tests/containerizer/ns_tests.cpp            |   2 +-
 src/tests/containerizer/port_mapping_tests.cpp  |  58 +--
 .../containerizer/provisioner_appc_tests.cpp    |  20 +-
 .../containerizer/provisioner_backend_tests.cpp |   2 +-
 .../containerizer/provisioner_docker_tests.cpp  |   8 +-
 src/tests/containerizer/routing_tests.cpp       | 136 +++---
 src/tests/containerizer/xfs_quota_tests.cpp     |  80 ++--
 src/tests/cram_md5_authentication_tests.cpp     |   8 +-
 src/tests/credentials_tests.cpp                 |   6 +-
 src/tests/default_executor_tests.cpp            |   2 +-
 src/tests/disk_quota_tests.cpp                  |   2 +-
 src/tests/dynamic_weights_tests.cpp             |  38 +-
 src/tests/environment.cpp                       |  12 +-
 src/tests/exception_tests.cpp                   |   4 +-
 src/tests/executor_http_api_tests.cpp           |  18 +-
 src/tests/fault_tolerance_tests.cpp             |  82 ++--
 src/tests/fetcher_cache_tests.cpp               |  58 +--
 src/tests/fetcher_tests.cpp                     |  18 +-
 src/tests/files_tests.cpp                       |   8 +-
 src/tests/gc_tests.cpp                          |  48 +-
 src/tests/group_tests.cpp                       |  80 ++--
 src/tests/health_check_tests.cpp                | 264 +++++------
 src/tests/hook_tests.cpp                        |  44 +-
 src/tests/http_authentication_tests.cpp         |   2 +-
 src/tests/http_fault_tolerance_tests.cpp        |  14 +-
 src/tests/ldd_tests.cpp                         |   8 +-
 src/tests/log_tests.cpp                         | 154 +++----
 src/tests/master_allocator_tests.cpp            |  10 +-
 src/tests/master_authorization_tests.cpp        | 114 ++---
 src/tests/master_contender_detector_tests.cpp   |  16 +-
 src/tests/master_maintenance_tests.cpp          |  94 ++--
 src/tests/master_slave_reconciliation_tests.cpp |  40 +-
 src/tests/master_tests.cpp                      | 360 +++++++--------
 src/tests/master_validation_tests.cpp           |  86 ++--
 src/tests/metrics_tests.cpp                     |   4 +-
 src/tests/oversubscription_tests.cpp            |  86 ++--
 src/tests/partition_tests.cpp                   | 224 ++++-----
 src/tests/persistent_volume_endpoints_tests.cpp |  46 +-
 src/tests/persistent_volume_tests.cpp           | 124 ++---
 src/tests/protobuf_io_tests.cpp                 |   4 +-
 src/tests/rate_limiting_tests.cpp               |  18 +-
 src/tests/reconciliation_tests.cpp              | 142 +++---
 src/tests/registrar_tests.cpp                   | 180 ++++----
 src/tests/registrar_zookeeper_tests.cpp         |   4 +-
 src/tests/reservation_endpoints_tests.cpp       |  42 +-
 src/tests/reservation_tests.cpp                 | 106 ++---
 src/tests/resource_offers_tests.cpp             |  28 +-
 src/tests/resources_tests.cpp                   |  64 +--
 src/tests/role_tests.cpp                        |  40 +-
 src/tests/scheduler_driver_tests.cpp            |  18 +-
 src/tests/scheduler_event_call_tests.cpp        |  36 +-
 src/tests/scheduler_http_api_tests.cpp          | 112 ++---
 src/tests/scheduler_tests.cpp                   |  14 +-
 src/tests/script.cpp                            |   2 +-
 src/tests/slave_authorization_tests.cpp         |  36 +-
 src/tests/slave_recovery_tests.cpp              | 198 ++++----
 src/tests/slave_tests.cpp                       | 214 ++++-----
 src/tests/state_tests.cpp                       |  16 +-
 src/tests/status_update_manager_tests.cpp       |  54 +--
 src/tests/upgrade_tests.cpp                     |   2 +-
 src/tests/utils.cpp                             |   2 +-
 src/tests/values_tests.cpp                      | 176 +++----
 src/tests/zookeeper_tests.cpp                   |  10 +-
 src/tests/zookeeper_url_tests.cpp               |  56 +--
 85 files changed, 2534 insertions(+), 2534 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/api_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/api_tests.cpp b/src/tests/api_tests.cpp
index 08ad02e..29ae1bc 100644
--- a/src/tests/api_tests.cpp
+++ b/src/tests/api_tests.cpp
@@ -171,12 +171,12 @@ TEST_P(MasterAPITest, GetAgents)
     post(master.get()->pid, v1Call, contentType);
 
   AWAIT_READY(v1Response);
-  ASSERT_TRUE(v1Response.get().IsInitialized());
-  ASSERT_EQ(v1::master::Response::GET_AGENTS, v1Response.get().type());
-  ASSERT_EQ(v1Response.get().get_agents().agents_size(), 1);
+  ASSERT_TRUE(v1Response->IsInitialized());
+  ASSERT_EQ(v1::master::Response::GET_AGENTS, v1Response->type());
+  ASSERT_EQ(v1Response->get_agents().agents_size(), 1);
 
   const v1::master::Response::GetAgents::Agent& v1Agent =
-      v1Response.get().get_agents().agents(0);
+      v1Response->get_agents().agents(0);
 
   ASSERT_EQ("host", v1Agent.agent_info().hostname());
   ASSERT_EQ(agent.get()->pid, v1Agent.pid());
@@ -200,8 +200,8 @@ TEST_P(MasterAPITest, GetFlags)
     post(master.get()->pid, v1Call, contentType);
 
   AWAIT_READY(v1Response);
-  ASSERT_TRUE(v1Response.get().IsInitialized());
-  ASSERT_EQ(v1::master::Response::GET_FLAGS, v1Response.get().type());
+  ASSERT_TRUE(v1Response->IsInitialized());
+  ASSERT_EQ(v1::master::Response::GET_FLAGS, v1Response->type());
 }
 
 
@@ -233,11 +233,11 @@ TEST_P(MasterAPITest, GetFrameworks)
       post(master.get()->pid, v1Call, contentType);
 
   AWAIT_READY(v1Response);
-  ASSERT_TRUE(v1Response.get().IsInitialized());
-  ASSERT_EQ(v1::master::Response::GET_FRAMEWORKS, v1Response.get().type());
+  ASSERT_TRUE(v1Response->IsInitialized());
+  ASSERT_EQ(v1::master::Response::GET_FRAMEWORKS, v1Response->type());
 
   v1::master::Response::GetFrameworks frameworks =
-      v1Response.get().get_frameworks();
+      v1Response->get_frameworks();
 
   ASSERT_EQ(1, frameworks.frameworks_size());
   ASSERT_EQ("default", frameworks.frameworks(0).framework_info().name());
@@ -266,9 +266,9 @@ TEST_P(MasterAPITest, GetHealth)
     post(master.get()->pid, v1Call, contentType);
 
   AWAIT_READY(v1Response);
-  ASSERT_TRUE(v1Response.get().IsInitialized());
-  ASSERT_EQ(v1::master::Response::GET_HEALTH, v1Response.get().type());
-  ASSERT_TRUE(v1Response.get().get_health().healthy());
+  ASSERT_TRUE(v1Response->IsInitialized());
+  ASSERT_EQ(v1::master::Response::GET_HEALTH, v1Response->type());
+  ASSERT_TRUE(v1Response->get_health().healthy());
 }
 
 
@@ -286,11 +286,11 @@ TEST_P(MasterAPITest, GetVersion)
     post(master.get()->pid, v1Call, contentType);
 
   AWAIT_READY(v1Response);
-  ASSERT_TRUE(v1Response.get().IsInitialized());
-  ASSERT_EQ(v1::master::Response::GET_VERSION, v1Response.get().type());
+  ASSERT_TRUE(v1Response->IsInitialized());
+  ASSERT_EQ(v1::master::Response::GET_VERSION, v1Response->type());
 
   ASSERT_EQ(MESOS_VERSION,
-            v1Response.get().get_version().version_info().version());
+            v1Response->get_version().version_info().version());
 }
 
 
@@ -312,13 +312,13 @@ TEST_P(MasterAPITest, GetMetrics)
     post(master.get()->pid, v1Call, contentType);
 
   AWAIT_READY(v1Response);
-  ASSERT_TRUE(v1Response.get().IsInitialized());
-  ASSERT_EQ(v1::master::Response::GET_METRICS, v1Response.get().type());
+  ASSERT_TRUE(v1Response->IsInitialized());
+  ASSERT_EQ(v1::master::Response::GET_METRICS, v1Response->type());
 
   hashmap<string, double> metrics;
 
   foreach (const v1::Metric& metric,
-           v1Response.get().get_metrics().metrics()) {
+           v1Response->get_metrics().metrics()) {
     ASSERT_TRUE(metric.has_value());
     metrics[metric.name()] = metric.value();
   }
@@ -346,7 +346,7 @@ TEST_P(MasterAPITest, GetExecutors)
   ASSERT_SOME(slave);
 
   AWAIT_READY(slaveRegisteredMessage);
-  SlaveID slaveId = slaveRegisteredMessage.get().slave_id();
+  SlaveID slaveId = slaveRegisteredMessage->slave_id();
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
@@ -362,7 +362,7 @@ TEST_P(MasterAPITest, GetExecutors)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("test");
@@ -383,9 +383,9 @@ TEST_P(MasterAPITest, GetExecutors)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
-  EXPECT_TRUE(status.get().has_executor_id());
-  EXPECT_EQ(exec.id, status.get().executor_id());
+  EXPECT_EQ(TASK_RUNNING, status->state());
+  EXPECT_TRUE(status->has_executor_id());
+  EXPECT_EQ(exec.id, status->executor_id());
 
   v1::master::Call v1Call;
   v1Call.set_type(v1::master::Call::GET_EXECUTORS);
@@ -396,15 +396,15 @@ TEST_P(MasterAPITest, GetExecutors)
     post(master.get()->pid, v1Call, contentType);
 
   AWAIT_READY(v1Response);
-  ASSERT_TRUE(v1Response.get().IsInitialized());
-  ASSERT_EQ(v1::master::Response::GET_EXECUTORS, v1Response.get().type());
-  ASSERT_EQ(1, v1Response.get().get_executors().executors_size());
+  ASSERT_TRUE(v1Response->IsInitialized());
+  ASSERT_EQ(v1::master::Response::GET_EXECUTORS, v1Response->type());
+  ASSERT_EQ(1, v1Response->get_executors().executors_size());
 
   ASSERT_EQ(evolve(slaveId),
-            v1Response.get().get_executors().executors(0).agent_id());
+            v1Response->get_executors().executors(0).agent_id());
 
   v1::ExecutorInfo executorInfo =
-    v1Response.get().get_executors().executors(0).executor_info();
+    v1Response->get_executors().executors(0).executor_info();
 
   ASSERT_EQ(evolve(exec.id), executorInfo.executor_id());
 
@@ -449,7 +449,7 @@ TEST_P(MasterAPITest, GetState)
 
   driver.start();
 
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   ContentType contentType = GetParam();
 
@@ -494,7 +494,7 @@ TEST_P(MasterAPITest, GetState)
   AWAIT_READY(execDriver);
   AWAIT_READY(status);
 
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   AWAIT_READY(acknowledgement);
 
@@ -529,7 +529,7 @@ TEST_P(MasterAPITest, GetState)
   execDriver.get()->sendStatusUpdate(status3);
 
   AWAIT_READY(status2);
-  EXPECT_EQ(TASK_FINISHED, status2.get().state());
+  EXPECT_EQ(TASK_FINISHED, status2->state());
 
   AWAIT_READY(acknowledgement);
 
@@ -569,13 +569,13 @@ TEST_P(MasterAPITest, GetTasksNoRunningTask)
     post(master.get()->pid, v1Call, contentType);
 
   AWAIT_READY(v1Response);
-  ASSERT_TRUE(v1Response.get().IsInitialized());
-  ASSERT_EQ(v1::master::Response::GET_TASKS, v1Response.get().type());
+  ASSERT_TRUE(v1Response->IsInitialized());
+  ASSERT_EQ(v1::master::Response::GET_TASKS, v1Response->type());
 
-  ASSERT_EQ(0, v1Response.get().get_tasks().pending_tasks().size());
-  ASSERT_EQ(0, v1Response.get().get_tasks().tasks().size());
-  ASSERT_EQ(0, v1Response.get().get_tasks().completed_tasks().size());
-  ASSERT_EQ(0, v1Response.get().get_tasks().orphan_tasks().size());
+  ASSERT_EQ(0, v1Response->get_tasks().pending_tasks().size());
+  ASSERT_EQ(0, v1Response->get_tasks().tasks().size());
+  ASSERT_EQ(0, v1Response->get_tasks().completed_tasks().size());
+  ASSERT_EQ(0, v1Response->get_tasks().orphan_tasks().size());
 }
 
 
@@ -607,7 +607,7 @@ TEST_P(MasterAPITest, GetTasks)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("test");
@@ -638,9 +638,9 @@ TEST_P(MasterAPITest, GetTasks)
   AWAIT_READY(execDriver);
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
-  EXPECT_TRUE(status.get().has_executor_id());
-  EXPECT_EQ(exec.id, status.get().executor_id());
+  EXPECT_EQ(TASK_RUNNING, status->state());
+  EXPECT_TRUE(status->has_executor_id());
+  EXPECT_EQ(exec.id, status->executor_id());
 
   AWAIT_READY(acknowledgement);
 
@@ -654,13 +654,13 @@ TEST_P(MasterAPITest, GetTasks)
       post(master.get()->pid, v1Call, contentType);
 
     AWAIT_READY(v1Response);
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::master::Response::GET_TASKS, v1Response.get().type());
-    ASSERT_EQ(1, v1Response.get().get_tasks().tasks().size());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::master::Response::GET_TASKS, v1Response->type());
+    ASSERT_EQ(1, v1Response->get_tasks().tasks().size());
     ASSERT_EQ(v1::TaskState::TASK_RUNNING,
-              v1Response.get().get_tasks().tasks(0).state());
-    ASSERT_EQ("test", v1Response.get().get_tasks().tasks(0).name());
-    ASSERT_EQ("1", v1Response.get().get_tasks().tasks(0).task_id().value());
+              v1Response->get_tasks().tasks(0).state());
+    ASSERT_EQ("test", v1Response->get_tasks().tasks(0).name());
+    ASSERT_EQ("1", v1Response->get_tasks().tasks(0).task_id().value());
   }
 
   acknowledgement = FUTURE_PROTOBUF(
@@ -680,7 +680,7 @@ TEST_P(MasterAPITest, GetTasks)
   execDriver.get()->sendStatusUpdate(status3);
 
   AWAIT_READY(status2);
-  EXPECT_EQ(TASK_FINISHED, status2.get().state());
+  EXPECT_EQ(TASK_FINISHED, status2->state());
 
   AWAIT_READY(acknowledgement);
 
@@ -689,16 +689,16 @@ TEST_P(MasterAPITest, GetTasks)
       post(master.get()->pid, v1Call, contentType);
 
     AWAIT_READY(v1Response);
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::master::Response::GET_TASKS, v1Response.get().type());
-    ASSERT_EQ(0, v1Response.get().get_tasks().tasks().size());
-    ASSERT_EQ(1, v1Response.get().get_tasks().completed_tasks().size());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::master::Response::GET_TASKS, v1Response->type());
+    ASSERT_EQ(0, v1Response->get_tasks().tasks().size());
+    ASSERT_EQ(1, v1Response->get_tasks().completed_tasks().size());
     ASSERT_EQ(v1::TaskState::TASK_FINISHED,
-              v1Response.get().get_tasks().completed_tasks(0).state());
-    ASSERT_EQ("test", v1Response.get().get_tasks().completed_tasks(0).name());
+              v1Response->get_tasks().completed_tasks(0).state());
+    ASSERT_EQ("test", v1Response->get_tasks().completed_tasks(0).name());
     ASSERT_EQ(
         "1",
-        v1Response.get().get_tasks().completed_tasks(0).task_id().value());
+        v1Response->get_tasks().completed_tasks(0).task_id().value());
   }
 
   EXPECT_CALL(exec, shutdown(_))
@@ -723,11 +723,11 @@ TEST_P(MasterAPITest, GetLoggingLevel)
     post(master.get()->pid, v1Call, contentType);
 
   AWAIT_READY(v1Response);
-  ASSERT_TRUE(v1Response.get().IsInitialized());
-  ASSERT_EQ(v1::master::Response::GET_LOGGING_LEVEL, v1Response.get().type());
+  ASSERT_TRUE(v1Response->IsInitialized());
+  ASSERT_EQ(v1::master::Response::GET_LOGGING_LEVEL, v1Response->type());
   ASSERT_LE(0, FLAGS_v);
   ASSERT_EQ(
-      v1Response.get().get_logging_level().level(),
+      v1Response->get_logging_level().level(),
       static_cast<uint32_t>(FLAGS_v));
 }
 
@@ -814,10 +814,10 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(MasterAPITest, ListFiles)
     post(master.get()->pid, v1Call, contentType);
 
   AWAIT_READY(v1Response);
-  ASSERT_TRUE(v1Response.get().IsInitialized());
-  ASSERT_EQ(v1::master::Response::LIST_FILES, v1Response.get().type());
-  ASSERT_EQ(3, v1Response.get().list_files().file_infos().size());
-  ASSERT_EQ(evolve(file), v1Response.get().list_files().file_infos(2));
+  ASSERT_TRUE(v1Response->IsInitialized());
+  ASSERT_EQ(v1::master::Response::LIST_FILES, v1Response->type());
+  ASSERT_EQ(3, v1Response->list_files().file_infos().size());
+  ASSERT_EQ(evolve(file), v1Response->list_files().file_infos(2));
 }
 
 
@@ -1182,14 +1182,14 @@ TEST_P(MasterAPITest, UpdateAndGetMaintenanceSchedule)
     post(master.get()->pid, v1GetScheduleCall, contentType);
 
   AWAIT_READY(v1GetScheduleResponse);
-  ASSERT_TRUE(v1GetScheduleResponse.get().IsInitialized());
+  ASSERT_TRUE(v1GetScheduleResponse->IsInitialized());
   ASSERT_EQ(
       v1::master::Response::GET_MAINTENANCE_SCHEDULE,
-      v1GetScheduleResponse.get().type());
+      v1GetScheduleResponse->type());
 
   // Verify maintenance schedule matches the expectation.
   v1::maintenance::Schedule respSchedule =
-    v1GetScheduleResponse.get().get_maintenance_schedule().schedule();
+    v1GetScheduleResponse->get_maintenance_schedule().schedule();
   ASSERT_EQ(1, respSchedule.windows().size());
   ASSERT_EQ(2, respSchedule.windows(0).machine_ids().size());
   ASSERT_EQ("Machine1", respSchedule.windows(0).machine_ids(0).hostname());
@@ -1248,14 +1248,14 @@ TEST_P(MasterAPITest, GetMaintenanceStatus)
     post(master.get()->pid, v1GetStatusCall, contentType);
 
   AWAIT_READY(v1GetStatusResponse);
-  ASSERT_TRUE(v1GetStatusResponse.get().IsInitialized());
+  ASSERT_TRUE(v1GetStatusResponse->IsInitialized());
   ASSERT_EQ(
       v1::master::Response::GET_MAINTENANCE_STATUS,
-      v1GetStatusResponse.get().type());
+      v1GetStatusResponse->type());
 
   // Verify maintenance status matches the expectation.
   v1::maintenance::ClusterStatus status =
-    v1GetStatusResponse.get().get_maintenance_status().status();
+    v1GetStatusResponse->get_maintenance_status().status();
   ASSERT_EQ(2, status.draining_machines().size());
   ASSERT_EQ(0, status.down_machines().size());
 }
@@ -1364,14 +1364,14 @@ TEST_P(MasterAPITest, StartAndStopMaintenance)
     post(master.get()->pid, v1GetScheduleCall, contentType);
 
   AWAIT_READY(v1GetScheduleResponse);
-  ASSERT_TRUE(v1GetScheduleResponse.get().IsInitialized());
+  ASSERT_TRUE(v1GetScheduleResponse->IsInitialized());
   ASSERT_EQ(
       v1::master::Response::GET_MAINTENANCE_SCHEDULE,
-      v1GetScheduleResponse.get().type());
+      v1GetScheduleResponse->type());
 
   // Check that only one maintenance window remains.
   v1::maintenance::Schedule respSchedule =
-    v1GetScheduleResponse.get().get_maintenance_schedule().schedule();
+    v1GetScheduleResponse->get_maintenance_schedule().schedule();
   ASSERT_EQ(1, respSchedule.windows().size());
   ASSERT_EQ(2, respSchedule.windows(0).machine_ids().size());
   ASSERT_EQ("Machine1", respSchedule.windows(0).machine_ids(0).hostname());
@@ -1404,7 +1404,7 @@ TEST_P(MasterAPITest, SubscribeAgentEvents)
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(http::OK().status, response);
   AWAIT_EXPECT_RESPONSE_HEADER_EQ("chunked", "Transfer-Encoding", response);
-  ASSERT_EQ(http::Response::PIPE, response.get().type);
+  ASSERT_EQ(http::Response::PIPE, response->type);
   ASSERT_SOME(response->reader);
 
   http::Pipe::Reader reader = response->reader.get();
@@ -1418,9 +1418,9 @@ TEST_P(MasterAPITest, SubscribeAgentEvents)
   Future<Result<v1::master::Event>> event = decoder.read();
   AWAIT_READY(event);
 
-  EXPECT_EQ(v1::master::Event::SUBSCRIBED, event.get().get().type());
+  EXPECT_EQ(v1::master::Event::SUBSCRIBED, event->get().type());
   const v1::master::Response::GetState& getState =
-      event.get().get().subscribed().get_state();
+      event->get().subscribed().get_state();
 
   EXPECT_EQ(0u, getState.get_frameworks().frameworks_size());
   EXPECT_EQ(0u, getState.get_agents().agents_size());
@@ -1443,13 +1443,13 @@ TEST_P(MasterAPITest, SubscribeAgentEvents)
   event = decoder.read();
   AWAIT_READY(event);
 
-  SlaveID agentID = agentRegisteredMessage.get().slave_id();
+  SlaveID agentID = agentRegisteredMessage->slave_id();
 
   {
-    ASSERT_EQ(v1::master::Event::AGENT_ADDED, event.get().get().type());
+    ASSERT_EQ(v1::master::Event::AGENT_ADDED, event->get().type());
 
     const v1::master::Response::GetAgents::Agent& agent =
-      event.get().get().agent_added().agent();
+      event->get().agent_added().agent();
 
     ASSERT_EQ("host", agent.agent_info().hostname());
     ASSERT_EQ(evolve(agentID), agent.agent_info().id());
@@ -1466,8 +1466,8 @@ TEST_P(MasterAPITest, SubscribeAgentEvents)
   AWAIT_READY(event);
 
   {
-    ASSERT_EQ(v1::master::Event::AGENT_REMOVED, event.get().get().type());
-    ASSERT_EQ(evolve(agentID), event.get().get().agent_removed().agent_id());
+    ASSERT_EQ(v1::master::Event::AGENT_REMOVED, event->get().type());
+    ASSERT_EQ(evolve(agentID), event->get().agent_removed().agent_id());
   }
 }
 
@@ -1494,7 +1494,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(MasterAPITest, GetRecoveredAgents)
 
   AWAIT_READY(slaveRegisteredMessage);
 
-  v1::AgentID agentId = evolve(slaveRegisteredMessage.get().slave_id());
+  v1::AgentID agentId = evolve(slaveRegisteredMessage->slave_id());
 
   // Ensure that the agent is present in `GetAgent.agents` while
   // `GetAgents.recovered_agents` is empty.
@@ -1508,12 +1508,12 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(MasterAPITest, GetRecoveredAgents)
       post(master.get()->pid, v1Call, contentType);
 
     AWAIT_READY(v1Response);
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::master::Response::GET_AGENTS, v1Response.get().type());
-    ASSERT_EQ(1, v1Response.get().get_agents().agents_size());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::master::Response::GET_AGENTS, v1Response->type());
+    ASSERT_EQ(1, v1Response->get_agents().agents_size());
     ASSERT_EQ(agentId,
-              v1Response.get().get_agents().agents(0).agent_info().id());
-    ASSERT_EQ(0, v1Response.get().get_agents().recovered_agents_size());
+              v1Response->get_agents().agents(0).agent_info().id());
+    ASSERT_EQ(0, v1Response->get_agents().recovered_agents_size());
   }
 
   // Stop the slave while the master is down.
@@ -1537,11 +1537,11 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(MasterAPITest, GetRecoveredAgents)
       post(master.get()->pid, v1Call, contentType);
 
     AWAIT_READY(v1Response);
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::master::Response::GET_AGENTS, v1Response.get().type());
-    ASSERT_EQ(0u, v1Response.get().get_agents().agents_size());
-    ASSERT_EQ(1u, v1Response.get().get_agents().recovered_agents_size());
-    ASSERT_EQ(agentId, v1Response.get().get_agents().recovered_agents(0).id());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::master::Response::GET_AGENTS, v1Response->type());
+    ASSERT_EQ(0u, v1Response->get_agents().agents_size());
+    ASSERT_EQ(1u, v1Response->get_agents().recovered_agents_size());
+    ASSERT_EQ(agentId, v1Response->get_agents().recovered_agents(0).id());
   }
 
   Future<SlaveReregisteredMessage> slaveReregisteredMessage =
@@ -1566,10 +1566,10 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(MasterAPITest, GetRecoveredAgents)
       post(master.get()->pid, v1Call, contentType);
 
     AWAIT_READY(v1Response);
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::master::Response::GET_AGENTS, v1Response.get().type());
-    ASSERT_EQ(1u, v1Response.get().get_agents().agents_size());
-    ASSERT_EQ(0u, v1Response.get().get_agents().recovered_agents_size());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::master::Response::GET_AGENTS, v1Response->type());
+    ASSERT_EQ(1u, v1Response->get_agents().agents_size());
+    ASSERT_EQ(0u, v1Response->get_agents().recovered_agents_size());
   }
 }
 
@@ -1653,7 +1653,7 @@ TEST_P(MasterAPITest, Subscribe)
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(http::OK().status, response);
   AWAIT_EXPECT_RESPONSE_HEADER_EQ("chunked", "Transfer-Encoding", response);
-  ASSERT_EQ(http::Response::PIPE, response.get().type);
+  ASSERT_EQ(http::Response::PIPE, response->type);
   ASSERT_SOME(response->reader);
 
   http::Pipe::Reader reader = response->reader.get();
@@ -1667,9 +1667,9 @@ TEST_P(MasterAPITest, Subscribe)
   Future<Result<v1::master::Event>> event = decoder.read();
   AWAIT_READY(event);
 
-  EXPECT_EQ(v1::master::Event::SUBSCRIBED, event.get().get().type());
+  EXPECT_EQ(v1::master::Event::SUBSCRIBED, event->get().type());
   const v1::master::Response::GetState& getState =
-      event.get().get().subscribed().get_state();
+      event->get().subscribed().get_state();
 
   EXPECT_EQ(1u, getState.get_frameworks().frameworks_size());
   EXPECT_EQ(1u, getState.get_agents().agents_size());
@@ -1718,21 +1718,21 @@ TEST_P(MasterAPITest, Subscribe)
   AWAIT_READY(event);
   AWAIT_READY(update);
 
-  ASSERT_EQ(v1::master::Event::TASK_ADDED, event.get().get().type());
+  ASSERT_EQ(v1::master::Event::TASK_ADDED, event->get().type());
   ASSERT_EQ(evolve(task.task_id()),
-            event.get().get().task_added().task().task_id());
+            event->get().task_added().task().task_id());
 
   event = decoder.read();
 
   AWAIT_READY(event);
 
-  ASSERT_EQ(v1::master::Event::TASK_UPDATED, event.get().get().type());
+  ASSERT_EQ(v1::master::Event::TASK_UPDATED, event->get().type());
   ASSERT_EQ(v1::TASK_RUNNING,
-            event.get().get().task_updated().state());
+            event->get().task_updated().state());
   ASSERT_EQ(v1::TASK_RUNNING,
-            event.get().get().task_updated().status().state());
+            event->get().task_updated().status().state());
   ASSERT_EQ(evolve(task.task_id()),
-            event.get().get().task_updated().status().task_id());
+            event->get().task_updated().status().task_id());
 
   event = decoder.read();
 
@@ -1969,7 +1969,7 @@ TEST_P(MasterAPITest, CreateAndDestroyVolumes)
   ASSERT_SOME(slave);
 
   AWAIT_READY(slaveRegisteredMessage);
-  SlaveID slaveId = slaveRegisteredMessage.get().slave_id();
+  SlaveID slaveId = slaveRegisteredMessage->slave_id();
 
   // Create the persistent volume.
   v1::master::Call v1CreateVolumesCall;
@@ -2027,7 +2027,7 @@ TEST_P(MasterAPITest, CreateAndDestroyVolumes)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
   Offer offer = offers.get()[0];
 
   EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -2055,7 +2055,7 @@ TEST_P(MasterAPITest, CreateAndDestroyVolumes)
   driver.acceptOffers({offer.id()}, {LAUNCH({taskInfo})});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_FINISHED, status.get().state());
+  EXPECT_EQ(TASK_FINISHED, status->state());
 
   // Destroy the persistent volume.
   v1::master::Call v1DestroyVolumesCall;
@@ -2200,11 +2200,11 @@ TEST_P(MasterAPITest, ReadFile)
 
     AWAIT_READY(v1Response);
 
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::master::Response::READ_FILE, v1Response.get().type());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::master::Response::READ_FILE, v1Response->type());
 
-    ASSERT_EQ("od", v1Response.get().read_file().data());
-    ASSERT_EQ(4, v1Response.get().read_file().size());
+    ASSERT_EQ("od", v1Response->read_file().data());
+    ASSERT_EQ(4, v1Response->read_file().size());
   }
 
   // Read the file with `offset >= size`. This should return the size of file
@@ -2223,11 +2223,11 @@ TEST_P(MasterAPITest, ReadFile)
 
     AWAIT_READY(v1Response);
 
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::master::Response::READ_FILE, v1Response.get().type());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::master::Response::READ_FILE, v1Response->type());
 
-    ASSERT_EQ("", v1Response.get().read_file().data());
-    ASSERT_EQ(4, v1Response.get().read_file().size());
+    ASSERT_EQ("", v1Response->read_file().data());
+    ASSERT_EQ(4, v1Response->read_file().size());
   }
 
   // Read the file without length being set and `offset=0`. This should read
@@ -2245,11 +2245,11 @@ TEST_P(MasterAPITest, ReadFile)
 
     AWAIT_READY(v1Response);
 
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::master::Response::READ_FILE, v1Response.get().type());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::master::Response::READ_FILE, v1Response->type());
 
-    ASSERT_EQ("body", v1Response.get().read_file().data());
-    ASSERT_EQ(4, v1Response.get().read_file().size());
+    ASSERT_EQ("body", v1Response->read_file().data());
+    ASSERT_EQ(4, v1Response->read_file().size());
   }
 
   // Read the file with `length > size - offset`. This should return the
@@ -2268,11 +2268,11 @@ TEST_P(MasterAPITest, ReadFile)
 
     AWAIT_READY(v1Response);
 
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::master::Response::READ_FILE, v1Response.get().type());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::master::Response::READ_FILE, v1Response->type());
 
-    ASSERT_EQ("ody", v1Response.get().read_file().data());
-    ASSERT_EQ(4, v1Response.get().read_file().size());
+    ASSERT_EQ("ody", v1Response->read_file().data());
+    ASSERT_EQ(4, v1Response->read_file().size());
   }
 }
 
@@ -2411,8 +2411,8 @@ TEST_P(AgentAPITest, GetFlags)
     post(slave.get()->pid, v1Call, contentType);
 
   AWAIT_READY(v1Response);
-  ASSERT_TRUE(v1Response.get().IsInitialized());
-  ASSERT_EQ(v1::agent::Response::GET_FLAGS, v1Response.get().type());
+  ASSERT_TRUE(v1Response->IsInitialized());
+  ASSERT_EQ(v1::agent::Response::GET_FLAGS, v1Response->type());
 }
 
 
@@ -2439,9 +2439,9 @@ TEST_P(AgentAPITest, GetHealth)
     post(slave.get()->pid, v1Call, contentType);
 
   AWAIT_READY(v1Response);
-  ASSERT_TRUE(v1Response.get().IsInitialized());
-  ASSERT_EQ(v1::agent::Response::GET_HEALTH, v1Response.get().type());
-  ASSERT_TRUE(v1Response.get().get_health().healthy());
+  ASSERT_TRUE(v1Response->IsInitialized());
+  ASSERT_EQ(v1::agent::Response::GET_HEALTH, v1Response->type());
+  ASSERT_TRUE(v1Response->get_health().healthy());
 }
 
 
@@ -2468,11 +2468,11 @@ TEST_P(AgentAPITest, GetVersion)
     post(slave.get()->pid, v1Call, contentType);
 
   AWAIT_READY(v1Response);
-  ASSERT_TRUE(v1Response.get().IsInitialized());
-  ASSERT_EQ(v1::agent::Response::GET_VERSION, v1Response.get().type());
+  ASSERT_TRUE(v1Response->IsInitialized());
+  ASSERT_EQ(v1::agent::Response::GET_VERSION, v1Response->type());
 
   ASSERT_EQ(MESOS_VERSION,
-            v1Response.get().get_version().version_info().version());
+            v1Response->get_version().version_info().version());
 }
 
 
@@ -2503,13 +2503,13 @@ TEST_P(AgentAPITest, GetMetrics)
     post(slave.get()->pid, v1Call, contentType);
 
   AWAIT_READY(v1Response);
-  ASSERT_TRUE(v1Response.get().IsInitialized());
-  ASSERT_EQ(v1::agent::Response::GET_METRICS, v1Response.get().type());
+  ASSERT_TRUE(v1Response->IsInitialized());
+  ASSERT_EQ(v1::agent::Response::GET_METRICS, v1Response->type());
 
   hashmap<string, double> metrics;
 
   foreach (const v1::Metric& metric,
-           v1Response.get().get_metrics().metrics()) {
+           v1Response->get_metrics().metrics()) {
     ASSERT_TRUE(metric.has_value());
     metrics[metric.name()] = metric.value();
   }
@@ -2542,11 +2542,11 @@ TEST_P(AgentAPITest, GetLoggingLevel)
     post(slave.get()->pid, v1Call, contentType);
 
   AWAIT_READY(v1Response);
-  ASSERT_TRUE(v1Response.get().IsInitialized());
-  ASSERT_EQ(v1::agent::Response::GET_LOGGING_LEVEL, v1Response.get().type());
+  ASSERT_TRUE(v1Response->IsInitialized());
+  ASSERT_EQ(v1::agent::Response::GET_LOGGING_LEVEL, v1Response->type());
   ASSERT_LE(0, FLAGS_v);
   ASSERT_EQ(
-      v1Response.get().get_logging_level().level(),
+      v1Response->get_logging_level().level(),
       static_cast<uint32_t>(FLAGS_v));
 }
 
@@ -2651,10 +2651,10 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, ListFiles)
     post(slave.get()->pid, v1Call, contentType);
 
   AWAIT_READY(v1Response);
-  ASSERT_TRUE(v1Response.get().IsInitialized());
-  ASSERT_EQ(v1::agent::Response::LIST_FILES, v1Response.get().type());
-  ASSERT_EQ(3, v1Response.get().list_files().file_infos().size());
-  ASSERT_EQ(evolve(file), v1Response.get().list_files().file_infos(2));
+  ASSERT_TRUE(v1Response->IsInitialized());
+  ASSERT_EQ(v1::agent::Response::LIST_FILES, v1Response->type());
+  ASSERT_EQ(3, v1Response->list_files().file_infos().size());
+  ASSERT_EQ(evolve(file), v1Response->list_files().file_infos(2));
 }
 
 
@@ -2718,7 +2718,7 @@ TEST_P(AgentAPITest, GetContainers)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -2746,15 +2746,15 @@ TEST_P(AgentAPITest, GetContainers)
       post(slave.get()->pid, v1Call, contentType);
 
     AWAIT_READY(v1Response);
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::agent::Response::GET_CONTAINERS, v1Response.get().type());
-    ASSERT_EQ(0, v1Response.get().get_containers().containers_size());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::agent::Response::GET_CONTAINERS, v1Response->type());
+    ASSERT_EQ(0, v1Response->get_containers().containers_size());
   }
 
   driver.launchTasks(offer.id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   ResourceStatistics statistics;
   statistics.set_mem_limit_bytes(2048);
@@ -2781,11 +2781,11 @@ TEST_P(AgentAPITest, GetContainers)
     post(slave.get()->pid, v1Call, contentType);
 
   AWAIT_READY(v1Response);
-  ASSERT_TRUE(v1Response.get().IsInitialized());
-  ASSERT_EQ(v1::agent::Response::GET_CONTAINERS, v1Response.get().type());
-  ASSERT_EQ(1, v1Response.get().get_containers().containers_size());
+  ASSERT_TRUE(v1Response->IsInitialized());
+  ASSERT_EQ(v1::agent::Response::GET_CONTAINERS, v1Response->type());
+  ASSERT_EQ(1, v1Response->get_containers().containers_size());
   ASSERT_EQ("192.168.1.20",
-            v1Response.get().get_containers().containers(0).container_status()
+            v1Response->get_containers().containers(0).container_status()
               .network_infos(0).ip_addresses(0).ip_address());
 
   EXPECT_CALL(exec, shutdown(_))
@@ -2833,11 +2833,11 @@ TEST_P(AgentAPITest, ReadFile)
 
     AWAIT_READY(v1Response);
 
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::agent::Response::READ_FILE, v1Response.get().type());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::agent::Response::READ_FILE, v1Response->type());
 
-    ASSERT_EQ("od", v1Response.get().read_file().data());
-    ASSERT_EQ(4, v1Response.get().read_file().size());
+    ASSERT_EQ("od", v1Response->read_file().data());
+    ASSERT_EQ(4, v1Response->read_file().size());
   }
 
   // Read the file with `offset >= size`. This should return the size of file
@@ -2856,11 +2856,11 @@ TEST_P(AgentAPITest, ReadFile)
 
     AWAIT_READY(v1Response);
 
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::agent::Response::READ_FILE, v1Response.get().type());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::agent::Response::READ_FILE, v1Response->type());
 
-    ASSERT_EQ("", v1Response.get().read_file().data());
-    ASSERT_EQ(4, v1Response.get().read_file().size());
+    ASSERT_EQ("", v1Response->read_file().data());
+    ASSERT_EQ(4, v1Response->read_file().size());
   }
 
   // Read the file without length being set and `offset=0`. This should read
@@ -2878,11 +2878,11 @@ TEST_P(AgentAPITest, ReadFile)
 
     AWAIT_READY(v1Response);
 
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::agent::Response::READ_FILE, v1Response.get().type());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::agent::Response::READ_FILE, v1Response->type());
 
-    ASSERT_EQ("body", v1Response.get().read_file().data());
-    ASSERT_EQ(4, v1Response.get().read_file().size());
+    ASSERT_EQ("body", v1Response->read_file().data());
+    ASSERT_EQ(4, v1Response->read_file().size());
   }
 
   // Read the file with `length > size - offset`. This should return the
@@ -2901,11 +2901,11 @@ TEST_P(AgentAPITest, ReadFile)
 
     AWAIT_READY(v1Response);
 
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::agent::Response::READ_FILE, v1Response.get().type());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::agent::Response::READ_FILE, v1Response->type());
 
-    ASSERT_EQ("ody", v1Response.get().read_file().data());
-    ASSERT_EQ(4, v1Response.get().read_file().size());
+    ASSERT_EQ("ody", v1Response->read_file().data());
+    ASSERT_EQ(4, v1Response->read_file().size());
   }
 }
 
@@ -2970,7 +2970,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetFrameworks)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
   const Offer& offer = offers.get()[0];
 
   TaskInfo task;
@@ -2998,10 +2998,10 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetFrameworks)
       post(slave.get()->pid, v1Call, contentType);
 
     AWAIT_READY(v1Response);
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::agent::Response::GET_FRAMEWORKS, v1Response.get().type());
-    ASSERT_EQ(0, v1Response.get().get_frameworks().frameworks_size());
-    ASSERT_EQ(0, v1Response.get().get_frameworks().completed_frameworks_size());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::agent::Response::GET_FRAMEWORKS, v1Response->type());
+    ASSERT_EQ(0, v1Response->get_frameworks().frameworks_size());
+    ASSERT_EQ(0, v1Response->get_frameworks().completed_frameworks_size());
   }
 
   driver.launchTasks(offer.id(), {task});
@@ -3018,10 +3018,10 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetFrameworks)
       post(slave.get()->pid, v1Call, contentType);
 
     AWAIT_READY(v1Response);
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::agent::Response::GET_FRAMEWORKS, v1Response.get().type());
-    ASSERT_EQ(1, v1Response.get().get_frameworks().frameworks_size());
-    ASSERT_EQ(0, v1Response.get().get_frameworks().completed_frameworks_size());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::agent::Response::GET_FRAMEWORKS, v1Response->type());
+    ASSERT_EQ(1, v1Response->get_frameworks().frameworks_size());
+    ASSERT_EQ(0, v1Response->get_frameworks().completed_frameworks_size());
   }
 
   // Make sure the executor terminated.
@@ -3043,10 +3043,10 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetFrameworks)
       post(slave.get()->pid, v1Call, contentType);
 
     AWAIT_READY(v1Response);
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::agent::Response::GET_FRAMEWORKS, v1Response.get().type());
-    ASSERT_EQ(0, v1Response.get().get_frameworks().frameworks_size());
-    ASSERT_EQ(1, v1Response.get().get_frameworks().completed_frameworks_size());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::agent::Response::GET_FRAMEWORKS, v1Response->type());
+    ASSERT_EQ(0, v1Response->get_frameworks().frameworks_size());
+    ASSERT_EQ(1, v1Response->get_frameworks().completed_frameworks_size());
   }
 }
 
@@ -3073,7 +3073,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetExecutors)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
   const Offer& offer = offers.get()[0];
 
   TaskInfo task;
@@ -3101,10 +3101,10 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetExecutors)
       post(slave.get()->pid, v1Call, contentType);
 
     AWAIT_READY(v1Response);
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::agent::Response::GET_EXECUTORS, v1Response.get().type());
-    ASSERT_EQ(0, v1Response.get().get_executors().executors_size());
-    ASSERT_EQ(0, v1Response.get().get_executors().completed_executors_size());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::agent::Response::GET_EXECUTORS, v1Response->type());
+    ASSERT_EQ(0, v1Response->get_executors().executors_size());
+    ASSERT_EQ(0, v1Response->get_executors().completed_executors_size());
   }
 
   driver.launchTasks(offer.id(), {task});
@@ -3121,10 +3121,10 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetExecutors)
       post(slave.get()->pid, v1Call, contentType);
 
     AWAIT_READY(v1Response);
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::agent::Response::GET_EXECUTORS, v1Response.get().type());
-    ASSERT_EQ(1, v1Response.get().get_executors().executors_size());
-    ASSERT_EQ(0, v1Response.get().get_executors().completed_executors_size());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::agent::Response::GET_EXECUTORS, v1Response->type());
+    ASSERT_EQ(1, v1Response->get_executors().executors_size());
+    ASSERT_EQ(0, v1Response->get_executors().completed_executors_size());
   }
 
   // Make sure the executor terminated.
@@ -3150,10 +3150,10 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetExecutors)
       post(slave.get()->pid, v1Call, contentType);
 
     AWAIT_READY(v1Response);
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::agent::Response::GET_EXECUTORS, v1Response.get().type());
-    ASSERT_EQ(0, v1Response.get().get_executors().executors_size());
-    ASSERT_EQ(1, v1Response.get().get_executors().completed_executors_size());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::agent::Response::GET_EXECUTORS, v1Response->type());
+    ASSERT_EQ(0, v1Response->get_executors().executors_size());
+    ASSERT_EQ(1, v1Response->get_executors().completed_executors_size());
   }
 }
 
@@ -3180,7 +3180,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetTasks)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
   const Offer& offer = offers.get()[0];
 
   TaskInfo task;
@@ -3208,13 +3208,13 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetTasks)
       post(slave.get()->pid, v1Call, contentType);
 
     AWAIT_READY(v1Response);
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::agent::Response::GET_TASKS, v1Response.get().type());
-    ASSERT_EQ(0, v1Response.get().get_tasks().pending_tasks_size());
-    ASSERT_EQ(0, v1Response.get().get_tasks().queued_tasks_size());
-    ASSERT_EQ(0, v1Response.get().get_tasks().launched_tasks_size());
-    ASSERT_EQ(0, v1Response.get().get_tasks().terminated_tasks_size());
-    ASSERT_EQ(0, v1Response.get().get_tasks().completed_tasks_size());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::agent::Response::GET_TASKS, v1Response->type());
+    ASSERT_EQ(0, v1Response->get_tasks().pending_tasks_size());
+    ASSERT_EQ(0, v1Response->get_tasks().queued_tasks_size());
+    ASSERT_EQ(0, v1Response->get_tasks().launched_tasks_size());
+    ASSERT_EQ(0, v1Response->get_tasks().terminated_tasks_size());
+    ASSERT_EQ(0, v1Response->get_tasks().completed_tasks_size());
   }
 
   driver.launchTasks(offer.id(), {task});
@@ -3231,13 +3231,13 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetTasks)
       post(slave.get()->pid, v1Call, contentType);
 
     AWAIT_READY(v1Response);
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::agent::Response::GET_TASKS, v1Response.get().type());
-    ASSERT_EQ(0, v1Response.get().get_tasks().pending_tasks_size());
-    ASSERT_EQ(0, v1Response.get().get_tasks().queued_tasks_size());
-    ASSERT_EQ(1, v1Response.get().get_tasks().launched_tasks_size());
-    ASSERT_EQ(0, v1Response.get().get_tasks().terminated_tasks_size());
-    ASSERT_EQ(0, v1Response.get().get_tasks().completed_tasks_size());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::agent::Response::GET_TASKS, v1Response->type());
+    ASSERT_EQ(0, v1Response->get_tasks().pending_tasks_size());
+    ASSERT_EQ(0, v1Response->get_tasks().queued_tasks_size());
+    ASSERT_EQ(1, v1Response->get_tasks().launched_tasks_size());
+    ASSERT_EQ(0, v1Response->get_tasks().terminated_tasks_size());
+    ASSERT_EQ(0, v1Response->get_tasks().completed_tasks_size());
   }
 
   Clock::pause();
@@ -3270,13 +3270,13 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetTasks)
       post(slave.get()->pid, v1Call, contentType);
 
     AWAIT_READY(v1Response);
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::agent::Response::GET_TASKS, v1Response.get().type());
-    ASSERT_EQ(0, v1Response.get().get_tasks().pending_tasks_size());
-    ASSERT_EQ(0, v1Response.get().get_tasks().queued_tasks_size());
-    ASSERT_EQ(0, v1Response.get().get_tasks().launched_tasks_size());
-    ASSERT_EQ(0, v1Response.get().get_tasks().terminated_tasks_size());
-    ASSERT_EQ(1, v1Response.get().get_tasks().completed_tasks_size());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::agent::Response::GET_TASKS, v1Response->type());
+    ASSERT_EQ(0, v1Response->get_tasks().pending_tasks_size());
+    ASSERT_EQ(0, v1Response->get_tasks().queued_tasks_size());
+    ASSERT_EQ(0, v1Response->get_tasks().launched_tasks_size());
+    ASSERT_EQ(0, v1Response->get_tasks().terminated_tasks_size());
+    ASSERT_EQ(1, v1Response->get_tasks().completed_tasks_size());
   }
 
   driver.stop();
@@ -3310,8 +3310,8 @@ TEST_P(AgentAPITest, GetAgent)
     post(slave.get()->pid, v1Call, contentType);
 
   AWAIT_READY(v1Response);
-  ASSERT_TRUE(v1Response.get().IsInitialized());
-  ASSERT_EQ(v1::agent::Response::GET_AGENT, v1Response.get().type());
+  ASSERT_TRUE(v1Response->IsInitialized());
+  ASSERT_EQ(v1::agent::Response::GET_AGENT, v1Response->type());
   ASSERT_EQ(flags.hostname,
             v1Response->get_agent().agent_info().hostname());
 }
@@ -3339,7 +3339,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetState)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
   const Offer& offer = offers.get()[0];
 
   TaskInfo task;
@@ -3368,8 +3368,8 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetState)
       post(slave.get()->pid, v1Call, contentType);
 
     AWAIT_READY(v1Response);
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::agent::Response::GET_STATE, v1Response.get().type());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::agent::Response::GET_STATE, v1Response->type());
 
     const v1::agent::Response::GetState& getState = v1Response->get_state();
     ASSERT_EQ(0u, getState.get_frameworks().frameworks_size());
@@ -3392,8 +3392,8 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetState)
       post(slave.get()->pid, v1Call, contentType);
 
     AWAIT_READY(v1Response);
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::agent::Response::GET_STATE, v1Response.get().type());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::agent::Response::GET_STATE, v1Response->type());
 
     const v1::agent::Response::GetState& getState = v1Response->get_state();
     ASSERT_EQ(1u, getState.get_frameworks().frameworks_size());
@@ -3447,8 +3447,8 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, GetState)
       post(slave.get()->pid, v1Call, contentType);
 
     AWAIT_READY(v1Response);
-    ASSERT_TRUE(v1Response.get().IsInitialized());
-    ASSERT_EQ(v1::agent::Response::GET_STATE, v1Response.get().type());
+    ASSERT_TRUE(v1Response->IsInitialized());
+    ASSERT_EQ(v1::agent::Response::GET_STATE, v1Response->type());
 
     const v1::agent::Response::GetState& getState = v1Response->get_state();
     ASSERT_EQ(0u, getState.get_frameworks().frameworks_size());
@@ -4088,7 +4088,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, LaunchNestedContainerSession)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   Future<TaskStatus> status;
   EXPECT_CALL(sched, statusUpdate(_, _))
@@ -4209,7 +4209,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   Future<TaskStatus> status;
   EXPECT_CALL(sched, statusUpdate(_, _))
@@ -4305,7 +4305,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   Future<TaskStatus> status;
   EXPECT_CALL(sched, statusUpdate(_, _))
@@ -4422,7 +4422,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   Future<TaskStatus> status;
   EXPECT_CALL(sched, statusUpdate(_, _))
@@ -4533,7 +4533,7 @@ TEST_P(AgentAPITest, AttachContainerOutputFailure)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   EXPECT_CALL(exec, registered(_, _, _, _));
 
@@ -4617,7 +4617,7 @@ TEST_F(AgentAPITest, AttachContainerInputFailure)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   EXPECT_CALL(exec, registered(_, _, _, _));
 
@@ -4692,7 +4692,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(
   slave::Flags flags = CreateSlaveFlags();
   {
     mesos::ACL::AttachContainerInput* acl =
-      flags.acls.get().add_attach_containers_input();
+      flags.acls->add_attach_containers_input();
     acl->mutable_principals()->add_values(DEFAULT_CREDENTIAL.principal());
     acl->mutable_users()->set_type(mesos::ACL::Entity::NONE);
   }
@@ -4726,7 +4726,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   Future<TaskStatus> status;
   EXPECT_CALL(sched, statusUpdate(_, _))

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/authentication_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/authentication_tests.cpp b/src/tests/authentication_tests.cpp
index adbe030..b04be76 100644
--- a/src/tests/authentication_tests.cpp
+++ b/src/tests/authentication_tests.cpp
@@ -102,7 +102,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(AuthenticationTest, UnauthenticatedSlave)
 
   // Slave should get error message from the master.
   AWAIT_READY(shutdownMessage);
-  ASSERT_NE("", shutdownMessage.get().message());
+  ASSERT_NE("", shutdownMessage->message());
 }
 
 
@@ -163,7 +163,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(AuthenticationTest, DisableSlaveAuthentication)
 
   // Slave should be able to get registered.
   AWAIT_READY(slaveRegisteredMessage);
-  ASSERT_NE("", slaveRegisteredMessage.get().slave_id().value());
+  ASSERT_NE("", slaveRegisteredMessage->slave_id().value());
 }
 
 
@@ -322,7 +322,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(AuthenticationTest, AuthenticatedSlave)
 
   // Slave should be able to get registered.
   AWAIT_READY(slaveRegisteredMessage);
-  ASSERT_NE("", slaveRegisteredMessage.get().slave_id().value());
+  ASSERT_NE("", slaveRegisteredMessage->slave_id().value());
 }
 
 
@@ -396,7 +396,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(AuthenticationTest, RetrySlaveAuthentication)
 
   // Slave should be able to get registered.
   AWAIT_READY(slaveRegisteredMessage);
-  ASSERT_NE("", slaveRegisteredMessage.get().slave_id().value());
+  ASSERT_NE("", slaveRegisteredMessage->slave_id().value());
 }
 
 
@@ -485,7 +485,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(AuthenticationTest,
 
   // Slave should be able to get registered.
   AWAIT_READY(slaveRegisteredMessage);
-  ASSERT_NE("", slaveRegisteredMessage.get().slave_id().value());
+  ASSERT_NE("", slaveRegisteredMessage->slave_id().value());
 }
 
 
@@ -579,7 +579,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(AuthenticationTest,
 
   // Slave should be able to get registered.
   AWAIT_READY(slaveRegisteredMessage);
-  ASSERT_NE("", slaveRegisteredMessage.get().slave_id().value());
+  ASSERT_NE("", slaveRegisteredMessage->slave_id().value());
 }
 
 
@@ -663,7 +663,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(AuthenticationTest,
 
   // Slave should be able to get registered.
   AWAIT_READY(slaveRegisteredMessage);
-  ASSERT_NE("", slaveRegisteredMessage.get().slave_id().value());
+  ASSERT_NE("", slaveRegisteredMessage->slave_id().value());
 }
 
 
@@ -737,7 +737,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(AuthenticationTest,
 
   // Slave should be able to get registered.
   AWAIT_READY(slaveRegisteredMessage);
-  ASSERT_NE("", slaveRegisteredMessage.get().slave_id().value());
+  ASSERT_NE("", slaveRegisteredMessage->slave_id().value());
 }
 
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/cluster.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cluster.cpp b/src/tests/cluster.cpp
index 04b7083..30076e8 100644
--- a/src/tests/cluster.cpp
+++ b/src/tests/cluster.cpp
@@ -219,10 +219,10 @@ Try<process::Owned<Master>> Master::start(
       master->log.reset(new mesos::log::Log(
           flags.quorum.get(),
           path::join(flags.work_dir.get(), "replicated_log"),
-          zookeeperUrl.get().servers,
+          zookeeperUrl->servers,
           flags.zk_session_timeout,
-          path::join(zookeeperUrl.get().path, "log_replicas"),
-          zookeeperUrl.get().authentication,
+          path::join(zookeeperUrl->path, "log_replicas"),
+          zookeeperUrl->authentication,
           flags.log_auto_initialize));
     } else {
       master->log.reset(new mesos::log::Log(
@@ -573,7 +573,7 @@ Slave::~Slave()
     containers = containerizer->containers();
     AWAIT_READY(containers);
 
-    ASSERT_TRUE(containers.get().empty())
+    ASSERT_TRUE(containers->empty())
       << "Failed to destroy containers: " << stringify(containers.get());
   }();
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/command_executor_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/command_executor_tests.cpp b/src/tests/command_executor_tests.cpp
index de735c6..a53fff3 100644
--- a/src/tests/command_executor_tests.cpp
+++ b/src/tests/command_executor_tests.cpp
@@ -310,25 +310,25 @@ TEST_P(CommandExecutorTest, NoTransitionFromKillingToRunning)
   driver.launchTasks(offers->front().id(), tasks);
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusHealthy);
-  EXPECT_EQ(TASK_RUNNING, statusHealthy.get().state());
-  EXPECT_TRUE(statusHealthy.get().has_healthy());
-  EXPECT_TRUE(statusHealthy.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusHealthy->state());
+  EXPECT_TRUE(statusHealthy->has_healthy());
+  EXPECT_TRUE(statusHealthy->healthy());
 
   driver.killTask(task.task_id());
 
   AWAIT_READY(statusKilling);
   EXPECT_EQ(TASK_KILLING, statusKilling->state());
-  EXPECT_FALSE(statusKilling.get().has_healthy());
+  EXPECT_FALSE(statusKilling->has_healthy());
 
   // Remove the temporary file, so that the health check fails.
   os::rm(tmpPath);
 
   AWAIT_READY(statusKilled);
   EXPECT_EQ(TASK_KILLED, statusKilled->state());
-  EXPECT_FALSE(statusKilled.get().has_healthy());
+  EXPECT_FALSE(statusKilled->has_healthy());
 
   driver.stop();
   driver.join();
@@ -408,8 +408,8 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HTTPCommandExecutorTest, TerminateWithACK)
   // The executor should self terminate with 0 as exit status once
   // it gets the ACK for the terminal status update from agent.
   AWAIT_READY(termination);
-  ASSERT_TRUE(termination.get().isReady());
-  EXPECT_EQ(0, termination.get().get().get().status());
+  ASSERT_TRUE(termination->isReady());
+  EXPECT_EQ(0, termination->get()->status());
 
   driver.stop();
   driver.join();

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/container_logger_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/container_logger_tests.cpp b/src/tests/container_logger_tests.cpp
index 54e5b29..dd7bbcb 100644
--- a/src/tests/container_logger_tests.cpp
+++ b/src/tests/container_logger_tests.cpp
@@ -162,7 +162,7 @@ TEST_F(ContainerLoggerTest, DefaultToSandbox)
   ASSERT_SOME(slave);
 
   AWAIT_READY(slaveRegisteredMessage);
-  SlaveID slaveId = slaveRegisteredMessage.get().slave_id();
+  SlaveID slaveId = slaveRegisteredMessage->slave_id();
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
@@ -182,7 +182,7 @@ TEST_F(ContainerLoggerTest, DefaultToSandbox)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // We'll start a task that outputs to stdout.
   TaskInfo task = createTask(offers.get()[0], "echo 'Hello World!'");
@@ -197,10 +197,10 @@ TEST_F(ContainerLoggerTest, DefaultToSandbox)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusFinished);
-  EXPECT_EQ(TASK_FINISHED, statusFinished.get().state());
+  EXPECT_EQ(TASK_FINISHED, statusFinished->state());
 
   driver.stop();
   driver.join();
@@ -263,7 +263,7 @@ TEST_F(ContainerLoggerTest, LOGROTATE_RotateInSandbox)
   ASSERT_SOME(slave);
 
   AWAIT_READY(slaveRegisteredMessage);
-  SlaveID slaveId = slaveRegisteredMessage.get().slave_id();
+  SlaveID slaveId = slaveRegisteredMessage->slave_id();
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
@@ -283,7 +283,7 @@ TEST_F(ContainerLoggerTest, LOGROTATE_RotateInSandbox)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Start a task that spams stdout with 11 MB of (mostly blank) output.
   // The logrotate container logger module is loaded with parameters that limit
@@ -305,10 +305,10 @@ TEST_F(ContainerLoggerTest, LOGROTATE_RotateInSandbox)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusFinished);
-  EXPECT_EQ(TASK_FINISHED, statusFinished.get().state());
+  EXPECT_EQ(TASK_FINISHED, statusFinished->state());
 
   driver.stop();
   driver.join();
@@ -318,7 +318,7 @@ TEST_F(ContainerLoggerTest, LOGROTATE_RotateInSandbox)
   // Once they finish reading the container's pipe, they should exit.
   Try<os::ProcessTree> pstrees = os::pstree(0);
   ASSERT_SOME(pstrees);
-  foreach (const os::ProcessTree& pstree, pstrees.get().children) {
+  foreach (const os::ProcessTree& pstree, pstrees->children) {
     // Wait for the logger subprocesses to exit, for up to 5 seconds each.
     Duration waited = Duration::zero();
     do {
@@ -413,7 +413,7 @@ TEST_F(ContainerLoggerTest, LOGROTATE_CustomRotateOptions)
   ASSERT_SOME(slave);
 
   AWAIT_READY(slaveRegisteredMessage);
-  SlaveID slaveId = slaveRegisteredMessage.get().slave_id();
+  SlaveID slaveId = slaveRegisteredMessage->slave_id();
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
@@ -433,7 +433,7 @@ TEST_F(ContainerLoggerTest, LOGROTATE_CustomRotateOptions)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   const string customConfig = "some-custom-logrotate-option";
 
@@ -456,10 +456,10 @@ TEST_F(ContainerLoggerTest, LOGROTATE_CustomRotateOptions)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusFinished);
-  EXPECT_EQ(TASK_FINISHED, statusFinished.get().state());
+  EXPECT_EQ(TASK_FINISHED, statusFinished->state());
 
   driver.stop();
   driver.join();
@@ -539,7 +539,7 @@ TEST_F(ContainerLoggerTest, LOGROTATE_ModuleFDOwnership)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Start a task that will keep running until the end of the test.
   TaskInfo task = createTask(offers.get()[0], "sleep 100");
@@ -554,7 +554,7 @@ TEST_F(ContainerLoggerTest, LOGROTATE_ModuleFDOwnership)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   // Open multiple files, so that we're fairly certain we've opened
   // the same FDs (integers) opened by the container logger.
@@ -567,10 +567,10 @@ TEST_F(ContainerLoggerTest, LOGROTATE_ModuleFDOwnership)
   }
 
   // Kill the task, which also kills the executor.
-  driver.killTask(statusRunning.get().task_id());
+  driver.killTask(statusRunning->task_id());
 
   AWAIT_READY(statusKilled);
-  EXPECT_EQ(TASK_KILLED, statusKilled.get().state());
+  EXPECT_EQ(TASK_KILLED, statusKilled->state());
 
   Future<Nothing> executorTerminated =
     FUTURE_DISPATCH(_, &Slave::executorTerminated);
@@ -644,7 +644,7 @@ TEST_P(UserContainerLoggerTest, ROOT_LOGROTATE_RotateWithSwitchUserTrueOrFalse)
   ASSERT_SOME(slave);
 
   AWAIT_READY(slaveRegisteredMessage);
-  SlaveID slaveId = slaveRegisteredMessage.get().slave_id();
+  SlaveID slaveId = slaveRegisteredMessage->slave_id();
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
@@ -664,7 +664,7 @@ TEST_P(UserContainerLoggerTest, ROOT_LOGROTATE_RotateWithSwitchUserTrueOrFalse)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Start a task that spams stdout with 3 MB of (mostly blank) output.
   // The logrotate container logger module is loaded with parameters that limit
@@ -689,10 +689,10 @@ TEST_P(UserContainerLoggerTest, ROOT_LOGROTATE_RotateWithSwitchUserTrueOrFalse)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusFinished);
-  EXPECT_EQ(TASK_FINISHED, statusFinished.get().state());
+  EXPECT_EQ(TASK_FINISHED, statusFinished->state());
 
   driver.stop();
   driver.join();
@@ -702,7 +702,7 @@ TEST_P(UserContainerLoggerTest, ROOT_LOGROTATE_RotateWithSwitchUserTrueOrFalse)
   // Once they finish reading the container's pipe, they should exit.
   Try<os::ProcessTree> pstrees = os::pstree(0);
   ASSERT_SOME(pstrees);
-  foreach (const os::ProcessTree& pstree, pstrees.get().children) {
+  foreach (const os::ProcessTree& pstree, pstrees->children) {
     // Wait for the logger subprocesses to exit, for up to 5 seconds each.
     Duration waited = Duration::zero();
     do {

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/containerizer/appc_spec_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/appc_spec_tests.cpp b/src/tests/containerizer/appc_spec_tests.cpp
index 840dbde..9bc8253 100644
--- a/src/tests/containerizer/appc_spec_tests.cpp
+++ b/src/tests/containerizer/appc_spec_tests.cpp
@@ -84,7 +84,7 @@ TEST_F(AppcSpecTest, ValidateImageManifest)
   ASSERT_SOME(imageManifest);
 
   // Check app object.
-  ASSERT_TRUE(imageManifest.get().has_app());
+  ASSERT_TRUE(imageManifest->has_app());
   ASSERT_TRUE(imageManifest->app().has_workingdirectory());
   EXPECT_EQ(imageManifest->app().workingdirectory(), "/opt/work");
   ASSERT_EQ(1, imageManifest->app().environment_size());
@@ -221,7 +221,7 @@ TEST_F(AppcSpecTest, ValidateImageManifestWithNullExec)
   ASSERT_SOME(imageManifest);
 
   // Check app object.
-  ASSERT_TRUE(imageManifest.get().has_app());
+  ASSERT_TRUE(imageManifest->has_app());
   EXPECT_FALSE(imageManifest->app().has_workingdirectory());
   EXPECT_EQ(0, imageManifest->app().environment_size());
   EXPECT_EQ(0, imageManifest->app().exec_size());

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/containerizer/cgroups_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/cgroups_isolator_tests.cpp b/src/tests/containerizer/cgroups_isolator_tests.cpp
index 971ea47..deb48c3 100644
--- a/src/tests/containerizer/cgroups_isolator_tests.cpp
+++ b/src/tests/containerizer/cgroups_isolator_tests.cpp
@@ -147,7 +147,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PERF_NET_CLS_UserCgroup)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Launch a task with the command executor.
   CommandInfo command;
@@ -177,7 +177,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PERF_NET_CLS_UserCgroup)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY_FOR(statusRunning, Seconds(60));
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   vector<string> subsystems = {
     CGROUP_SUBSYSTEM_CPU_NAME,
@@ -190,9 +190,9 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PERF_NET_CLS_UserCgroup)
 
   Future<hashset<ContainerID>> containers = containerizer->containers();
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
-  ContainerID containerId = *(containers.get().begin());
+  ContainerID containerId = *(containers->begin());
 
   foreach (const string& subsystem, subsystems) {
     Result<string> hierarchy = cgroups::hierarchy(subsystem);
@@ -286,7 +286,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_RevocableCpu)
 
   // Initially the framework will get all regular resources.
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
   EXPECT_TRUE(Resources(offers1.get()[0].resources()).revocable().empty());
 
   Future<vector<Offer>> offers2;
@@ -302,7 +302,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_RevocableCpu)
 
   // Now the framework will get revocable resources.
   AWAIT_READY(offers2);
-  EXPECT_NE(0u, offers2.get().size());
+  EXPECT_NE(0u, offers2->size());
   EXPECT_EQ(allocatedResources(cpus, frameworkInfo.role()),
             Resources(offers2.get()[0].resources()));
 
@@ -318,13 +318,13 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_RevocableCpu)
   driver.launchTasks(offers2.get()[0].id(), {task});
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   Future<hashset<ContainerID>> containers = containerizer->containers();
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
-  ContainerID containerId = *(containers.get().begin());
+  ContainerID containerId = *(containers->begin());
 
   Result<string> cpuHierarchy = cgroups::hierarchy("cpu");
   ASSERT_SOME(cpuHierarchy);
@@ -387,7 +387,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_CFS_EnableCfs)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Generate random numbers to max out a single core. We'll run this
   // for 0.5 seconds of wall time so it should consume approximately
@@ -414,13 +414,13 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_CFS_EnableCfs)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   Future<hashset<ContainerID>> containers = containerizer->containers();
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
-  ContainerID containerId = *(containers.get().begin());
+  ContainerID containerId = *(containers->begin());
 
   Future<ResourceStatistics> usage = containerizer->usage(containerId);
   AWAIT_READY(usage);
@@ -430,8 +430,8 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_CFS_EnableCfs)
   // this test will fail if the host system is very heavily loaded.
   // This behavior is correct because under such conditions we aren't
   // actually testing the CFS cpu limiter.
-  double cpuTime = usage.get().cpus_system_time_secs() +
-                   usage.get().cpus_user_time_secs();
+  double cpuTime = usage->cpus_system_time_secs() +
+                   usage->cpus_user_time_secs();
 
   EXPECT_GE(0.30, cpuTime);
   EXPECT_LE(0.05, cpuTime);
@@ -487,7 +487,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PidsAndTids)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   CommandInfo command;
   command.set_shell(false);
@@ -506,13 +506,13 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PidsAndTids)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   Future<hashset<ContainerID>> containers = containerizer->containers();
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
-  ContainerID containerId = *(containers.get().begin());
+  ContainerID containerId = *(containers->begin());
 
   Future<ResourceStatistics> usage = containerizer->usage(containerId);
   AWAIT_READY(usage);
@@ -525,8 +525,8 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PidsAndTids)
   //   - cat
   // For `cat` and `mesos-executor`, they keep idling during running
   // the test case. For other processes, they may occur temporarily.
-  EXPECT_GE(usage.get().processes(), 2U);
-  EXPECT_GE(usage.get().threads(), 2U);
+  EXPECT_GE(usage->processes(), 2U);
+  EXPECT_GE(usage->threads(), 2U);
 
   driver.stop();
   driver.join();
@@ -677,7 +677,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_NET_CLS_Isolate)
   AWAIT_READY(schedRegistered);
 
   AWAIT_READY(offers);
-  EXPECT_EQ(1u, offers.get().size());
+  EXPECT_EQ(1u, offers->size());
 
   // Create a task to be launched in the mesos-container. We will be
   // explicitly killing this task to perform the cleanup test.
@@ -691,14 +691,14 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_NET_CLS_Isolate)
 
   // Capture the update to verify that the task has been launched.
   AWAIT_READY(status);
-  ASSERT_EQ(TASK_RUNNING, status.get().state());
+  ASSERT_EQ(TASK_RUNNING, status->state());
 
   // Task is ready.  Make sure there is exactly 1 container in the hashset.
   Future<hashset<ContainerID>> containers = containerizer->containers();
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
-  const ContainerID& containerID = *(containers.get().begin());
+  const ContainerID& containerID = *(containers->begin());
 
   Result<string> hierarchy = cgroups::hierarchy("net_cls");
   ASSERT_SOME(hierarchy);
@@ -713,7 +713,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_NET_CLS_Isolate)
   ASSERT_SOME(pids);
 
   // There should be at least one TGID associated with this cgroup.
-  EXPECT_LE(1u, pids.get().size());
+  EXPECT_LE(1u, pids->size());
 
   // Read the `net_cls.classid` to verify that the handle has been set.
   Try<uint32_t> classid = cgroups::net_cls::classid(hierarchy.get(), cgroup);
@@ -739,7 +739,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_NET_CLS_Isolate)
   Future<Nothing> gcSchedule = FUTURE_DISPATCH(
       _, &slave::GarbageCollectorProcess::schedule);
 
-  driver.killTask(status.get().task_id());
+  driver.killTask(status->task_id());
 
   AWAIT_READY(gcSchedule);
 
@@ -804,7 +804,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_NET_CLS_ContainerStatus)
   AWAIT_READY(schedRegistered);
 
   AWAIT_READY(offers);
-  EXPECT_EQ(1u, offers.get().size());
+  EXPECT_EQ(1u, offers->size());
 
   // Create a task to be launched in the mesos-container.
   TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -816,7 +816,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_NET_CLS_ContainerStatus)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  ASSERT_EQ(TASK_RUNNING, status.get().state());
+  ASSERT_EQ(TASK_RUNNING, status->state());
 
   // Task is ready. Verify `ContainerStatus` is present in slave state.
   Future<Response> response = process::http::get(
@@ -828,7 +828,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_NET_CLS_ContainerStatus)
   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);
 
   Result<JSON::Object> netCls = parse->find<JSON::Object>(
@@ -895,7 +895,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PERF_Sample)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(offers.get()[0], "sleep 120");
 
@@ -906,21 +906,21 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PERF_Sample)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   Future<hashset<ContainerID>> containers = containerizer->containers();
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
-  ContainerID containerId = *(containers.get().begin());
+  ContainerID containerId = *(containers->begin());
 
   // This first sample is likely to be empty because perf hasn't
   // completed yet but we should still have the required fields.
   Future<ResourceStatistics> statistics1 = containerizer->usage(containerId);
   AWAIT_READY(statistics1);
-  ASSERT_TRUE(statistics1.get().has_perf());
-  EXPECT_TRUE(statistics1.get().perf().has_timestamp());
-  EXPECT_TRUE(statistics1.get().perf().has_duration());
+  ASSERT_TRUE(statistics1->has_perf());
+  EXPECT_TRUE(statistics1->perf().has_timestamp());
+  EXPECT_TRUE(statistics1->perf().has_duration());
 
   // Wait until we get the next sample. We use a generous timeout of
   // two seconds because we currently have a one second reap interval;
@@ -936,7 +936,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PERF_Sample)
 
     ASSERT_TRUE(statistics2.has_perf());
 
-    if (statistics1.get().perf().timestamp() !=
+    if (statistics1->perf().timestamp() !=
         statistics2.perf().timestamp()) {
       break;
     }
@@ -945,7 +945,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PERF_Sample)
     waited += Milliseconds(250);
   } while (waited < Seconds(2));
 
-  EXPECT_NE(statistics1.get().perf().timestamp(),
+  EXPECT_NE(statistics1->perf().timestamp(),
             statistics2.perf().timestamp());
 
   EXPECT_TRUE(statistics2.perf().has_cycles());
@@ -1099,13 +1099,13 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PERF_PerfForward)
   driver.launchTasks(offers2.get()[0].id(), {task2});
 
   AWAIT_READY(statusRunning2);
-  EXPECT_EQ(TASK_RUNNING, statusRunning2.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning2->state());
 
   containers = containerizer->containers();
 
   AWAIT_READY(containers);
-  ASSERT_EQ(2u, containers.get().size());
-  EXPECT_TRUE(containers.get().contains(containerId1));
+  ASSERT_EQ(2u, containers->size());
+  EXPECT_TRUE(containers->contains(containerId1));
 
   ContainerID containerId2;
   foreach (const ContainerID& containerId, containers.get()) {
@@ -1257,13 +1257,13 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_MemoryForward)
   driver.launchTasks(offers2.get()[0].id(), {task2});
 
   AWAIT_READY(statusRunning2);
-  EXPECT_EQ(TASK_RUNNING, statusRunning2.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning2->state());
 
   containers = containerizer->containers();
 
   AWAIT_READY(containers);
-  ASSERT_EQ(2u, containers.get().size());
-  EXPECT_TRUE(containers.get().contains(containerId1));
+  ASSERT_EQ(2u, containers->size());
+  EXPECT_TRUE(containers->contains(containerId1));
 
   ContainerID containerId2;
   foreach (const ContainerID& containerId, containers.get()) {
@@ -1365,7 +1365,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_MemoryBackward)
   Future<ResourceStatistics> usage = containerizer->usage(containerId1);
   AWAIT_READY(usage);
 
-  EXPECT_TRUE(usage.get().has_mem_total_bytes());
+  EXPECT_TRUE(usage->has_mem_total_bytes());
 
   slave.get()->terminate();
 
@@ -1413,13 +1413,13 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_MemoryBackward)
   driver.launchTasks(offers2.get()[0].id(), {task2});
 
   AWAIT_READY(statusRunning2);
-  EXPECT_EQ(TASK_RUNNING, statusRunning2.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning2->state());
 
   containers = containerizer->containers();
 
   AWAIT_READY(containers);
-  ASSERT_EQ(2u, containers.get().size());
-  EXPECT_TRUE(containers.get().contains(containerId1));
+  ASSERT_EQ(2u, containers->size());
+  EXPECT_TRUE(containers->contains(containerId1));
 
   ContainerID containerId2;
   foreach (const ContainerID& containerId, containers.get()) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/containerizer/cgroups_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/cgroups_tests.cpp b/src/tests/containerizer/cgroups_tests.cpp
index 9aa915d..8489e50 100644
--- a/src/tests/containerizer/cgroups_tests.cpp
+++ b/src/tests/containerizer/cgroups_tests.cpp
@@ -576,7 +576,7 @@ TEST_F(CgroupsAnyHierarchyWithCpuMemoryTest, ROOT_CGROUPS_Listen)
 
   // TODO(vinod): Instead of asserting here dynamically disable
   // the test if swap is enabled on the host.
-  ASSERT_EQ(memory.get().totalSwap, Bytes(0))
+  ASSERT_EQ(memory->totalSwap, Bytes(0))
     << "-------------------------------------------------------------\n"
     << "We cannot run this test because it appears you have swap\n"
     << "enabled, but feel free to disable this test.\n"
@@ -1096,7 +1096,7 @@ TEST_F(CgroupsAnyHierarchyMemoryPressureTest, ROOT_IncreaseRSS)
 
   // TODO(vinod): Instead of asserting here dynamically disable
   // the test if swap is enabled on the host.
-  ASSERT_EQ(memory.get().totalSwap, Bytes(0))
+  ASSERT_EQ(memory->totalSwap, Bytes(0))
     << "-------------------------------------------------------------\n"
     << "We cannot run this test because it appears you have swap\n"
     << "enabled, but feel free to disable this test.\n"

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/containerizer/cni_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/cni_isolator_tests.cpp b/src/tests/containerizer/cni_isolator_tests.cpp
index cb893d3..b770945 100644
--- a/src/tests/containerizer/cni_isolator_tests.cpp
+++ b/src/tests/containerizer/cni_isolator_tests.cpp
@@ -114,8 +114,8 @@ public:
         echo "  }"
         echo "}"
         )~",
-        hostIPNetwork.get().address(),
-        hostIPNetwork.get().prefix(),
+        hostIPNetwork->address(),
+        hostIPNetwork->prefix(),
         nameServer.get()).get());
 
     ASSERT_SOME(write);
@@ -301,9 +301,9 @@ TEST_F(CniIsolatorTest, ROOT_VerifyCheckpointedInfo)
 
   Future<hashset<ContainerID>> containers = containerizer.get()->containers();
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
-  ContainerID containerId = *(containers.get().begin());
+  ContainerID containerId = *(containers->begin());
 
   // Check if the CNI related information is checkpointed successfully.
   const string containerDir =
@@ -342,7 +342,7 @@ TEST_F(CniIsolatorTest, ROOT_VerifyCheckpointedInfo)
   driver.killTask(task.task_id());
 
   AWAIT_READY(statusKilled);
-  EXPECT_EQ(TASK_KILLED, statusKilled.get().state());
+  EXPECT_EQ(TASK_KILLED, statusKilled->state());
 
   AWAIT_READY(gcSchedule);
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/containerizer/cpu_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/cpu_isolator_tests.cpp b/src/tests/containerizer/cpu_isolator_tests.cpp
index f117826..3c6f748 100644
--- a/src/tests/containerizer/cpu_isolator_tests.cpp
+++ b/src/tests/containerizer/cpu_isolator_tests.cpp
@@ -106,7 +106,7 @@ TEST_P(CpuIsolatorTest, ROOT_UserCpuUsage)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Max out a single core in userspace. This will run for at most one
   // second.
@@ -121,13 +121,13 @@ TEST_P(CpuIsolatorTest, ROOT_UserCpuUsage)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   Future<hashset<ContainerID>> containers = containerizer->containers();
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
-  ContainerID containerId = *(containers.get().begin());
+  ContainerID containerId = *(containers->begin());
 
   // Wait up to 1 second for the child process to induce 1/8 of a
   // second of user cpu time.
@@ -197,7 +197,7 @@ TEST_P(CpuIsolatorTest, ROOT_SystemCpuUsage)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Generating random numbers is done by the kernel and will max out
   // a single core and run almost exclusively in the kernel, i.e.,
@@ -213,13 +213,13 @@ TEST_P(CpuIsolatorTest, ROOT_SystemCpuUsage)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   Future<hashset<ContainerID>> containers = containerizer->containers();
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
-  ContainerID containerId = *(containers.get().begin());
+  ContainerID containerId = *(containers->begin());
 
   // Wait up to 1 second for the child process to induce 1/8 of a
   // second of user cpu time.


[3/8] mesos git commit: Replace `.get().` in favor of the `->` operator in tests.

Posted by bm...@apache.org.
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);
 


[7/8] mesos git commit: Replace `.get().` in favor of the `->` operator in tests.

Posted by bm...@apache.org.
http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/containerizer/docker_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/docker_containerizer_tests.cpp b/src/tests/containerizer/docker_containerizer_tests.cpp
index 6484533..2036cd2 100644
--- a/src/tests/containerizer/docker_containerizer_tests.cpp
+++ b/src/tests/containerizer/docker_containerizer_tests.cpp
@@ -117,7 +117,7 @@ public:
       if (inspect.isReady()) {
         switch (state) {
           case ContainerState::RUNNING:
-            if (inspect.get().pid.isSome()) {
+            if (inspect->pid.isSome()) {
               return true;
             }
             // Retry looking for running pid until timeout.
@@ -222,7 +222,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Launch_Executor)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -271,9 +271,9 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Launch_Executor)
 
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY_FOR(statusRunning, Seconds(60));
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
   AWAIT_READY_FOR(statusFinished, Seconds(60));
-  EXPECT_EQ(TASK_FINISHED, statusFinished.get().state());
+  EXPECT_EQ(TASK_FINISHED, statusFinished->state());
 
   ASSERT_TRUE(exists(docker, slaveId, containerId.get()));
 
@@ -350,7 +350,7 @@ TEST_F(DockerContainerizerTest, DISABLED_ROOT_DOCKER_Launch_Executor_Bridged)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -400,9 +400,9 @@ TEST_F(DockerContainerizerTest, DISABLED_ROOT_DOCKER_Launch_Executor_Bridged)
 
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY_FOR(statusRunning, Seconds(60));
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
   AWAIT_READY_FOR(statusFinished, Seconds(60));
-  EXPECT_EQ(TASK_FINISHED, statusFinished.get().state());
+  EXPECT_EQ(TASK_FINISHED, statusFinished->state());
 
   ASSERT_TRUE(exists(docker, slaveId, containerId.get()));
 
@@ -470,7 +470,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Launch)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -511,10 +511,10 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Launch)
 
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY_FOR(statusRunning, Seconds(60));
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
-  ASSERT_TRUE(statusRunning.get().has_data());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
+  ASSERT_TRUE(statusRunning->has_data());
 
-  Try<JSON::Array> array = JSON::parse<JSON::Array>(statusRunning.get().data());
+  Try<JSON::Array> array = JSON::parse<JSON::Array>(statusRunning->data());
   ASSERT_SOME(array);
 
   // Check if container information is exposed through master's state endpoint.
@@ -526,10 +526,10 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Launch)
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(process::http::OK().status, 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);
 
-  Result<JSON::Value> find = parse.get().find<JSON::Value>(
+  Result<JSON::Value> find = parse->find<JSON::Value>(
       "frameworks[0].tasks[0].container.docker.privileged");
 
   EXPECT_SOME_FALSE(find);
@@ -543,10 +543,10 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Launch)
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(process::http::OK().status, response);
 
-  parse = JSON::parse<JSON::Object>(response.get().body);
+  parse = JSON::parse<JSON::Object>(response->body);
   ASSERT_SOME(parse);
 
-  find = parse.get().find<JSON::Value>(
+  find = parse->find<JSON::Value>(
       "frameworks[0].executors[0].tasks[0].container.docker.privileged");
 
   EXPECT_SOME_FALSE(find);
@@ -622,7 +622,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Kill)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -662,7 +662,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Kill)
 
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY_FOR(statusRunning, Seconds(60));
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   ASSERT_TRUE(
     exists(docker, slaveId, containerId.get(), ContainerState::RUNNING));
@@ -677,7 +677,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Kill)
   driver.killTask(task.task_id());
 
   AWAIT_READY(statusKilled);
-  EXPECT_EQ(TASK_KILLED, statusKilled.get().state());
+  EXPECT_EQ(TASK_KILLED, statusKilled->state());
 
   AWAIT_READY(termination);
   EXPECT_SOME(termination.get());
@@ -752,7 +752,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_TaskKillingCapability)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -875,7 +875,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Usage)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -919,7 +919,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Usage)
 
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY_FOR(statusRunning, Seconds(60));
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   // Verify the usage.
   ResourceStatistics statistics;
@@ -1021,7 +1021,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Update)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -1063,7 +1063,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Update)
   AWAIT_READY(containerId);
 
   AWAIT_READY_FOR(statusRunning, Seconds(60));
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   ASSERT_TRUE(
     exists(docker, slaveId, containerId.get(), ContainerState::RUNNING));
@@ -1089,7 +1089,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Update)
   ASSERT_SOME(cpuHierarchy);
   ASSERT_SOME(memoryHierarchy);
 
-  Option<pid_t> pid = inspect.get().pid;
+  Option<pid_t> pid = inspect->pid;
   ASSERT_SOME(pid);
 
   Result<string> cpuCgroup = cgroups::cpu::cgroup(pid.get());
@@ -1111,7 +1111,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Update)
   ASSERT_SOME(mem);
 
   EXPECT_EQ(1024u, cpu.get());
-  EXPECT_EQ(128u, mem.get().megabytes());
+  EXPECT_EQ(128u, mem->megabytes());
 
   newResources = Resources::parse("cpus:1;mem:144");
 
@@ -1131,7 +1131,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Update)
   ASSERT_SOME(mem);
 
   EXPECT_EQ(1024u, cpu.get());
-  EXPECT_EQ(144u, mem.get().megabytes());
+  EXPECT_EQ(144u, mem->megabytes());
 
   driver.stop();
   driver.join();
@@ -1241,7 +1241,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Recover)
 
   RunState runState;
   runState.id = containerId;
-  runState.forkedPid = wait.get().pid();
+  runState.forkedPid = wait->pid();
 
   execState.runs.put(containerId, runState);
   frameworkState.executors.put(execId, execState);
@@ -1381,7 +1381,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_KillOrphanContainers)
 
   RunState runState;
   runState.id = containerId;
-  runState.forkedPid = wait.get().pid();
+  runState.forkedPid = wait->pid();
 
   execState.runs.put(containerId, runState);
   frameworkState.executors.put(execId, execState);
@@ -1466,7 +1466,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_SkipRecoverNonDocker)
 
   // A MesosContainerizer task shouldn't be recovered by
   // DockerContainerizer.
-  EXPECT_EQ(0u, containers.get().size());
+  EXPECT_EQ(0u, containers->size());
 }
 
 
@@ -1610,7 +1610,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_LaunchWithPersistentVolumes)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -1675,10 +1675,10 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_LaunchWithPersistentVolumes)
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY(directory);
   AWAIT_READY_FOR(statusRunning, Seconds(60));
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusFinished);
-  EXPECT_EQ(TASK_FINISHED, statusFinished.get().state());
+  EXPECT_EQ(TASK_FINISHED, statusFinished->state());
 
   Future<Option<ContainerTermination>> termination =
     dockerContainerizer.wait(containerId.get());
@@ -1702,7 +1702,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_LaunchWithPersistentVolumes)
   EXPECT_SOME(table);
 
   // Verify that the persistent volume is unmounted.
-  foreach (const fs::MountInfoTable::Entry& entry, table.get().entries) {
+  foreach (const fs::MountInfoTable::Entry& entry, table->entries) {
     EXPECT_FALSE(
         strings::contains(entry.target, path::join(directory.get(), "path1")));
   }
@@ -1771,7 +1771,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_RecoverPersistentVolumes)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -1826,7 +1826,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_RecoverPersistentVolumes)
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY(directory);
   AWAIT_READY_FOR(statusRunning, Seconds(60));
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   // Recreate containerizer and start slave again.
   slave.get()->terminate();
@@ -1862,7 +1862,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_RecoverPersistentVolumes)
 
   // Verify that the recovered container's persistent volume is
   // unmounted.
-  foreach (const fs::MountInfoTable::Entry& entry, table.get().entries) {
+  foreach (const fs::MountInfoTable::Entry& entry, table->entries) {
     EXPECT_FALSE(
         strings::contains(entry.target, path::join(directory.get(), "path1")));
   }
@@ -1934,7 +1934,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_RecoverOrphanedPersistentVolumes)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -1989,7 +1989,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_RecoverOrphanedPersistentVolumes)
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY(directory);
   AWAIT_READY_FOR(statusRunning, Seconds(60));
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   // Recreate containerizer and start slave again.
   slave.get()->terminate();
@@ -2027,7 +2027,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_RecoverOrphanedPersistentVolumes)
 
   // Verify that the orphaned container's persistent volume is
   // unmounted.
-  foreach (const fs::MountInfoTable::Entry& entry, table.get().entries) {
+  foreach (const fs::MountInfoTable::Entry& entry, table->entries) {
     EXPECT_FALSE(
         strings::contains(entry.target, path::join(directory.get(), "path1")));
   }
@@ -2097,7 +2097,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Logs)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -2151,9 +2151,9 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Logs)
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY(directory);
   AWAIT_READY_FOR(statusRunning, Seconds(60));
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
   AWAIT_READY_FOR(statusFinished, Seconds(60));
-  EXPECT_EQ(TASK_FINISHED, statusFinished.get().state());
+  EXPECT_EQ(TASK_FINISHED, statusFinished->state());
 
   // Now check that the proper output is in stderr and stdout (which
   // might also contain other things, hence the use of a UUID).
@@ -2235,7 +2235,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Default_CMD)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -2283,9 +2283,9 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Default_CMD)
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY(directory);
   AWAIT_READY_FOR(statusRunning, Seconds(60));
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
   AWAIT_READY_FOR(statusFinished, Seconds(60));
-  EXPECT_EQ(TASK_FINISHED, statusFinished.get().state());
+  EXPECT_EQ(TASK_FINISHED, statusFinished->state());
 
   Try<string> read = os::read(path::join(directory.get(), "stdout"));
   ASSERT_SOME(read);
@@ -2366,7 +2366,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Default_CMD_Override)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -2416,9 +2416,9 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Default_CMD_Override)
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY(directory);
   AWAIT_READY_FOR(statusRunning, Seconds(60));
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
   AWAIT_READY_FOR(statusFinished, Seconds(60));
-  EXPECT_EQ(TASK_FINISHED, statusFinished.get().state());
+  EXPECT_EQ(TASK_FINISHED, statusFinished->state());
 
   // Now check that the proper output is in stderr and stdout.
   Try<string> read = os::read(path::join(directory.get(), "stdout"));
@@ -2502,7 +2502,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Default_CMD_Args)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -2553,9 +2553,9 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Default_CMD_Args)
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY(directory);
   AWAIT_READY_FOR(statusRunning, Seconds(60));
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
   AWAIT_READY_FOR(statusFinished, Seconds(60));
-  EXPECT_EQ(TASK_FINISHED, statusFinished.get().state());
+  EXPECT_EQ(TASK_FINISHED, statusFinished->state());
 
   // Now check that the proper output is in stderr and stdout.
   Try<string> read = os::read(path::join(directory.get(), "stdout"));
@@ -2640,7 +2640,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_SlaveRecoveryTaskContainer)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -2708,7 +2708,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_SlaveRecoveryTaskContainer)
   AWAIT_READY(reregisterExecutorMessage);
 
   ReregisterExecutorMessage reregister;
-  reregister.ParseFromString(reregisterExecutorMessage.get().body);
+  reregister.ParseFromString(reregisterExecutorMessage->body);
 
   // Executor should inform about the unacknowledged update.
   ASSERT_EQ(1, reregister.updates_size());
@@ -2718,7 +2718,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_SlaveRecoveryTaskContainer)
 
   // Scheduler should receive the recovered update.
   AWAIT_READY(status);
-  ASSERT_EQ(TASK_RUNNING, status.get().state());
+  ASSERT_EQ(TASK_RUNNING, status->state());
 
   ASSERT_TRUE(exists(docker, offer.slave_id(), containerId.get()));
 
@@ -2801,7 +2801,7 @@ TEST_F(DockerContainerizerTest,
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -2896,7 +2896,7 @@ TEST_F(DockerContainerizerTest,
   AWAIT_READY(reregisterExecutorMessage);
 
   ReregisterExecutorMessage reregister;
-  reregister.ParseFromString(reregisterExecutorMessage.get().body);
+  reregister.ParseFromString(reregisterExecutorMessage->body);
 
   // Executor should inform about the unacknowledged update.
   ASSERT_EQ(1, reregister.updates_size());
@@ -2906,7 +2906,7 @@ TEST_F(DockerContainerizerTest,
 
   // Scheduler should receive the recovered update.
   AWAIT_READY(status);
-  ASSERT_EQ(TASK_RUNNING, status.get().state());
+  ASSERT_EQ(TASK_RUNNING, status->state());
 
   ASSERT_TRUE(exists(docker, slaveId.get(), containerId.get()));
 
@@ -2975,7 +2975,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_NC_PortMapping)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -3030,7 +3030,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_NC_PortMapping)
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY(directory);
   AWAIT_READY_FOR(statusRunning, Seconds(60));
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   ASSERT_TRUE(
     exists(docker,
@@ -3045,10 +3045,10 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_NC_PortMapping)
       "echo " + uuid + " | nc localhost 10000");
 
   ASSERT_SOME(s);
-  AWAIT_READY_FOR(s.get().status(), Seconds(60));
+  AWAIT_READY_FOR(s->status(), Seconds(60));
 
   AWAIT_READY_FOR(statusFinished, Seconds(60));
-  EXPECT_EQ(TASK_FINISHED, statusFinished.get().state());
+  EXPECT_EQ(TASK_FINISHED, statusFinished->state());
 
   // Now check that the proper output is in stdout.
   Try<string> read = os::read(path::join(directory.get(), "stdout"));
@@ -3124,7 +3124,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_LaunchSandboxWithColon)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -3163,7 +3163,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_LaunchSandboxWithColon)
 
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY_FOR(statusRunning, Seconds(60));
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   ASSERT_TRUE(exists(docker, offer.slave_id(), containerId.get()));
 
@@ -3241,7 +3241,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DestroyWhileFetching)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -3288,7 +3288,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DestroyWhileFetching)
 
   AWAIT_READY(statusFailed);
 
-  EXPECT_EQ(TASK_FAILED, statusFailed.get().state());
+  EXPECT_EQ(TASK_FAILED, statusFailed->state());
 
   driver.stop();
   driver.join();
@@ -3361,7 +3361,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DestroyWhilePulling)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -3409,7 +3409,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DestroyWhilePulling)
 
   AWAIT_READY(statusFailed);
 
-  EXPECT_EQ(TASK_FAILED, statusFailed.get().state());
+  EXPECT_EQ(TASK_FAILED, statusFailed->state());
 
   driver.stop();
   driver.join();
@@ -3500,7 +3500,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_ExecutorCleanupWhenLaunchFailed)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -3542,9 +3542,9 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_ExecutorCleanupWhenLaunchFailed)
   AWAIT_READY_FOR(containerId, Seconds(60));
 
   AWAIT_READY(statusGone);
-  EXPECT_EQ(TASK_GONE, statusGone.get().state());
+  EXPECT_EQ(TASK_GONE, statusGone->state());
   EXPECT_EQ(TaskStatus::REASON_CONTAINER_UPDATE_FAILED,
-            statusGone.get().reason());
+            statusGone->reason());
 
   driver.stop();
   driver.join();
@@ -3608,7 +3608,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_FetchFailure)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -3650,12 +3650,12 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_FetchFailure)
 
   AWAIT_READY(statusFailed);
 
-  EXPECT_EQ(TASK_FAILED, statusFailed.get().state());
+  EXPECT_EQ(TASK_FAILED, statusFailed->state());
   EXPECT_EQ("Failed to launch container: some error from fetch",
-             statusFailed.get().message());
+             statusFailed->message());
 
   // TODO(jaybuff): When MESOS-2035 is addressed we should validate
-  // that statusFailed.get().reason() is correctly set here.
+  // that statusFailed->reason() is correctly set here.
 
   driver.stop();
   driver.join();
@@ -3719,7 +3719,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DockerPullFailure)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -3761,12 +3761,12 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DockerPullFailure)
 
   AWAIT_READY(statusFailed);
 
-  EXPECT_EQ(TASK_FAILED, statusFailed.get().state());
+  EXPECT_EQ(TASK_FAILED, statusFailed->state());
   EXPECT_EQ("Failed to launch container: some error from docker pull",
-             statusFailed.get().message());
+             statusFailed->message());
 
   // TODO(jaybuff): When MESOS-2035 is addressed we should validate
-  // that statusFailed.get().reason() is correctly set here.
+  // that statusFailed->reason() is correctly set here.
 
   driver.stop();
   driver.join();
@@ -3839,7 +3839,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DockerInspectDiscard)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -3889,7 +3889,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DockerInspectDiscard)
   AWAIT_READY_FOR(containerId, Seconds(60));
 
   AWAIT_READY(statusFailed);
-  EXPECT_EQ(TASK_FAILED, statusFailed.get().state());
+  EXPECT_EQ(TASK_FAILED, statusFailed->state());
 
   AWAIT_READY(executorLost);
 
@@ -4041,22 +4041,22 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_NoTransitionFromKillingToRunning)
 
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY_FOR(statusRunning, Seconds(60));
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   AWAIT_READY(statusHealthy);
-  EXPECT_EQ(TASK_RUNNING, statusHealthy.get().state());
-  EXPECT_TRUE(statusHealthy.get().has_healthy());
-  EXPECT_TRUE(statusHealthy.get().healthy());
+  EXPECT_EQ(TASK_RUNNING, statusHealthy->state());
+  EXPECT_TRUE(statusHealthy->has_healthy());
+  EXPECT_TRUE(statusHealthy->healthy());
 
   driver.killTask(task.task_id());
 
   AWAIT_READY(statusKilling);
   EXPECT_EQ(TASK_KILLING, statusKilling->state());
-  EXPECT_FALSE(statusKilling.get().has_healthy());
+  EXPECT_FALSE(statusKilling->has_healthy());
 
   AWAIT_READY(statusKilled);
   EXPECT_EQ(TASK_KILLED, statusKilled->state());
-  EXPECT_FALSE(statusKilled.get().has_healthy());
+  EXPECT_FALSE(statusKilled->has_healthy());
 
   Future<Option<ContainerTermination>> termination =
     containerizer.wait(containerId.get());
@@ -4125,7 +4125,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_CGROUPS_CFS_CgroupsEnableCFS)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   const Offer& offer = offers.get()[0];
 
@@ -4164,8 +4164,8 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_CGROUPS_CFS_CgroupsEnableCFS)
 
   AWAIT_READY_FOR(containerId, Seconds(60));
   AWAIT_READY_FOR(statusRunning, Seconds(60));
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
-  ASSERT_TRUE(statusRunning.get().has_data());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
+  ASSERT_TRUE(statusRunning->has_data());
 
   // Find cgroups cpu hierarchy of the container and verifies
   // quota is set.
@@ -4176,7 +4176,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_CGROUPS_CFS_CgroupsEnableCFS)
   Result<string> cpuHierarchy = cgroups::hierarchy("cpu");
   ASSERT_SOME(cpuHierarchy);
 
-  Option<pid_t> pid = inspect.get().pid;
+  Option<pid_t> pid = inspect->pid;
   ASSERT_SOME(pid);
 
   Result<string> cpuCgroup = cgroups::cpu::cgroup(pid.get());

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/containerizer/docker_spec_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/docker_spec_tests.cpp b/src/tests/containerizer/docker_spec_tests.cpp
index 82bddd2..d812592 100644
--- a/src/tests/containerizer/docker_spec_tests.cpp
+++ b/src/tests/containerizer/docker_spec_tests.cpp
@@ -381,77 +381,77 @@ TEST_F(DockerSpecTest, ParseV1ImageManifest)
 
   EXPECT_EQ(
       "7f652467f9e6d1b3bf51172868b9b0c2fa1c711b112f4e987029b1624dd6295f",
-      manifest.get().container());
+      manifest->container());
 
   EXPECT_EQ(
       "cfa753dfea5e68a24366dfba16e6edf573daa447abf65bc11619c1a98a3aff54",
-      manifest.get().parent());
+      manifest->parent());
 
   EXPECT_EQ(
       "./bin/start",
-      manifest.get().container_config().entrypoint(0));
+      manifest->container_config().entrypoint(0));
 
   EXPECT_EQ(
       "LANG=C.UTF-8",
-      manifest.get().container_config().env(0));
+      manifest->container_config().env(0));
 
   EXPECT_EQ(
       "JAVA_VERSION=8u66",
-      manifest.get().container_config().env(1));
+      manifest->container_config().env(1));
 
   EXPECT_EQ(
       "JAVA_DEBIAN_VERSION=8u66-b01-1~bpo8+1",
-      manifest.get().container_config().env(2));
+      manifest->container_config().env(2));
 
   EXPECT_EQ(
       "CA_CERTIFICATES_JAVA_VERSION=20140324",
-      manifest.get().container_config().env(3));
+      manifest->container_config().env(3));
 
-  EXPECT_EQ("/bin/sh", manifest.get().container_config().cmd(0));
-  EXPECT_EQ("-c", manifest.get().container_config().cmd(1));
+  EXPECT_EQ("/bin/sh", manifest->container_config().cmd(0));
+  EXPECT_EQ("-c", manifest->container_config().cmd(1));
 
   EXPECT_EQ(
       "#(nop) CMD [\"sh\"]",
-      manifest.get().container_config().cmd(2));
+      manifest->container_config().cmd(2));
 
   EXPECT_EQ(
       "com.nvidia.caffe.version",
-      manifest.get().container_config().labels(0).key());
+      manifest->container_config().labels(0).key());
 
   EXPECT_EQ(
       "0.14",
-      manifest.get().container_config().labels(0).value());
+      manifest->container_config().labels(0).value());
 
   EXPECT_EQ(
       "com.nvidia.digits.version",
-      manifest.get().container_config().labels(1).key());
+      manifest->container_config().labels(1).key());
 
   EXPECT_EQ(
       "3.0",
-      manifest.get().container_config().labels(1).value());
+      manifest->container_config().labels(1).value());
 
-  EXPECT_EQ("sh", manifest.get().config().cmd(0));
+  EXPECT_EQ("sh", manifest->config().cmd(0));
 
   EXPECT_EQ(
       "com.nvidia.cuda.version",
-      manifest.get().config().labels(0).key());
+      manifest->config().labels(0).key());
 
   EXPECT_EQ(
       "7.5",
-      manifest.get().config().labels(0).value());
+      manifest->config().labels(0).value());
 
   EXPECT_EQ(
       "com.nvidia.volumes.needed",
-      manifest.get().config().labels(1).key());
+      manifest->config().labels(1).key());
 
   EXPECT_EQ(
       "nvidia_driver",
-      manifest.get().config().labels(1).value());
+      manifest->config().labels(1).value());
 
-  EXPECT_EQ("1.8.2", manifest.get().docker_version());
-  EXPECT_EQ("amd64", manifest.get().architecture());
-  EXPECT_EQ("linux", manifest.get().os());
-  EXPECT_EQ(0u, manifest.get().size());
+  EXPECT_EQ("1.8.2", manifest->docker_version());
+  EXPECT_EQ("amd64", manifest->architecture());
+  EXPECT_EQ("linux", manifest->os());
+  EXPECT_EQ(0u, manifest->size());
 }
 
 
@@ -507,43 +507,43 @@ TEST_F(DockerSpecTest, ParseV2ImageManifest)
   Try<spec::v2::ImageManifest> manifest = spec::v2::parse(json.get());
   ASSERT_SOME(manifest);
 
-  EXPECT_EQ("dmcgowan/test-image", manifest.get().name());
-  EXPECT_EQ("latest", manifest.get().tag());
-  EXPECT_EQ("amd64", manifest.get().architecture());
+  EXPECT_EQ("dmcgowan/test-image", manifest->name());
+  EXPECT_EQ("latest", manifest->tag());
+  EXPECT_EQ("amd64", manifest->architecture());
 
   EXPECT_EQ(
       "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", // NOLINT(whitespace/line_length)
-      manifest.get().fslayers(0).blobsum());
+      manifest->fslayers(0).blobsum());
 
   EXPECT_EQ(
       "sha256:cea0d2071b01b0a79aa4a05ea56ab6fdf3fafa03369d9f4eea8d46ea33c43e5f", // NOLINT(whitespace/line_length)
-      manifest.get().fslayers(1).blobsum());
+      manifest->fslayers(1).blobsum());
 
   EXPECT_EQ(
       "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", // NOLINT(whitespace/line_length)
-      manifest.get().fslayers(2).blobsum());
+      manifest->fslayers(2).blobsum());
 
   EXPECT_EQ(
       "sha256:2a7812e636235448785062100bb9103096aa6655a8f6bb9ac9b13fe8290f66df", // NOLINT(whitespace/line_length)
-      manifest.get().fslayers(3).blobsum());
+      manifest->fslayers(3).blobsum());
 
   EXPECT_EQ(
       "2ce2e90b0bc7224de3db1f0d646fe8e2c4dd37f1793928287f6074bc451a57ea",
-      manifest.get().history(1).v1().id());
+      manifest->history(1).v1().id());
 
   EXPECT_EQ(
       "cf2616975b4a3cba083ca99bc3f0bf25f5f528c3c52be1596b30f60b0b1c37ff",
-      manifest.get().history(2).v1().parent());
+      manifest->history(2).v1().parent());
 
-  EXPECT_EQ(1u, manifest.get().schemaversion());
+  EXPECT_EQ(1u, manifest->schemaversion());
 
   EXPECT_EQ(
       "LYRA:YAG2:QQKS:376F:QQXY:3UNK:SXH7:K6ES:Y5AU:XUN5:ZLVY:KBYL",
-      manifest.get().signatures(0).header().jwk().kid());
+      manifest->signatures(0).header().jwk().kid());
 
   EXPECT_EQ(
       "m3bgdBXZYRQ4ssAbrgj8Kjl7GNgrKQvmCSY-00yzQosKi-8UBrIRrn3Iu5alj82B6u_jNrkGCjEx3TxrfT1rig", // NOLINT(whitespace/line_length)
-      manifest.get().signatures(0).signature());
+      manifest->signatures(0).signature());
 }
 
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/containerizer/docker_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/docker_tests.cpp b/src/tests/containerizer/docker_tests.cpp
index 452858d..0718243 100644
--- a/src/tests/containerizer/docker_tests.cpp
+++ b/src/tests/containerizer/docker_tests.cpp
@@ -157,9 +157,9 @@ TEST_F(DockerTest, ROOT_DOCKER_interface)
   EXPECT_TRUE(found);
 
   // Test some fields of the container.
-  EXPECT_NE("", inspect.get().id);
-  EXPECT_EQ("/" + containerName, inspect.get().name);
-  EXPECT_SOME(inspect.get().pid);
+  EXPECT_NE("", inspect->id);
+  EXPECT_EQ("/" + containerName, inspect->name);
+  EXPECT_SOME(inspect->pid);
 
   // Stop the container.
   Future<Nothing> stop = docker->stop(containerName);
@@ -192,9 +192,9 @@ TEST_F(DockerTest, ROOT_DOCKER_interface)
   inspect = docker->inspect(containerName);
   AWAIT_READY(inspect);
 
-  EXPECT_NE("", inspect.get().id);
-  EXPECT_EQ("/" + containerName, inspect.get().name);
-  EXPECT_NONE(inspect.get().pid);
+  EXPECT_NE("", inspect->id);
+  EXPECT_EQ("/" + containerName, inspect->name);
+  EXPECT_NONE(inspect->pid);
 
   // Remove the container.
   Future<Nothing> rm = docker->rm(containerName);
@@ -452,7 +452,7 @@ TEST_F(DockerTest, ROOT_DOCKER_CancelPull)
 
   ASSERT_SOME(s);
 
-  AWAIT_READY_FOR(s.get().status(), Seconds(30));
+  AWAIT_READY_FOR(s->status(), Seconds(30));
 
   Owned<Docker> docker = Docker::create(
       tests::flags.docker,
@@ -761,17 +761,17 @@ TEST_F(DockerImageTest, ParseInspectonImage)
   Try<Docker::Image> image = Docker::Image::create(json.get());
   ASSERT_SOME(image);
 
-  EXPECT_EQ("./bin/start", image.get().entrypoint.get().front());
-  EXPECT_EQ("C.UTF-8", image.get().environment.get().at("LANG"));
-  EXPECT_EQ("8u66", image.get().environment.get().at("JAVA_VERSION"));
+  EXPECT_EQ("./bin/start", image->entrypoint->front());
+  EXPECT_EQ("C.UTF-8", image->environment->at("LANG"));
+  EXPECT_EQ("8u66", image->environment->at("JAVA_VERSION"));
   EXPECT_EQ("8u66-b01-1~bpo8+1",
-            image.get().environment.get().at("JAVA_DEBIAN_VERSION"));
+            image->environment->at("JAVA_DEBIAN_VERSION"));
   EXPECT_EQ("--driver-java-options=-Xms1024M "
             "--driver-java-options=-Xmx4096M "
             "--driver-java-options=-Dlog4j.logLevel=info",
-            image.get().environment.get().at("SPARK_OPTS"));
+            image->environment->at("SPARK_OPTS"));
   EXPECT_EQ("20140324",
-            image.get().environment.get().at("CA_CERTIFICATES_JAVA_VERSION"));
+            image->environment->at("CA_CERTIFICATES_JAVA_VERSION"));
 }
 
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/containerizer/docker_volume_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/docker_volume_isolator_tests.cpp b/src/tests/containerizer/docker_volume_isolator_tests.cpp
index 4040d36..13a1f13 100644
--- a/src/tests/containerizer/docker_volume_isolator_tests.cpp
+++ b/src/tests/containerizer/docker_volume_isolator_tests.cpp
@@ -240,7 +240,7 @@ TEST_F(DockerVolumeIsolatorTest, ROOT_CommandTaskNoRootfsWithVolumes)
 
   Try<Owned<cluster::Slave>> slave = StartSlave(
       detector.get(),
-      containerizer.get().get(),
+      containerizer->get(),
       flags);
 
   ASSERT_SOME(slave);
@@ -394,7 +394,7 @@ TEST_F(DockerVolumeIsolatorTest, ROOT_CommandTaskNoRootfsFailedWithSameVolumes)
 
   Try<Owned<cluster::Slave>> slave = StartSlave(
       detector.get(),
-      containerizer.get().get(),
+      containerizer->get(),
       flags);
 
   ASSERT_SOME(slave);
@@ -494,7 +494,7 @@ TEST_F(DockerVolumeIsolatorTest, ROOT_CommandTaskNoRootfsSlaveRecovery)
 
   Try<Owned<cluster::Slave>> slave = StartSlave(
       detector.get(),
-      containerizer.get().get(),
+      containerizer->get(),
       flags);
 
   ASSERT_SOME(slave);
@@ -633,7 +633,7 @@ TEST_F(DockerVolumeIsolatorTest, ROOT_CommandTaskNoRootfsSlaveRecovery)
                     Return(Nothing())));
 
   // Use the same flags.
-  slave = StartSlave(detector.get(), containerizer.get().get(), flags);
+  slave = StartSlave(detector.get(), containerizer->get(), flags);
   ASSERT_SOME(slave);
 
   AWAIT_READY(reregistered);
@@ -643,9 +643,9 @@ TEST_F(DockerVolumeIsolatorTest, ROOT_CommandTaskNoRootfsSlaveRecovery)
 
   Future<hashset<ContainerID>> containers = containerizer.get()->containers();
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
-  ContainerID containerId = *(containers.get().begin());
+  ContainerID containerId = *(containers->begin());
 
   Future<TaskStatus> statusKilled;
   EXPECT_CALL(sched, statusUpdate(&driver, _))
@@ -691,7 +691,7 @@ TEST_F(DockerVolumeIsolatorTest,
 
   Try<Owned<cluster::Slave>> slave = StartSlave(
       detector.get(),
-      containerizer.get().get(),
+      containerizer->get(),
       flags);
 
   ASSERT_SOME(slave);
@@ -825,7 +825,7 @@ TEST_F(DockerVolumeIsolatorTest,
 
   Try<Owned<cluster::Slave>> slave = StartSlave(
       detector.get(),
-      containerizer.get().get(),
+      containerizer->get(),
       flags);
 
   ASSERT_SOME(slave);
@@ -960,7 +960,7 @@ TEST_F(DockerVolumeIsolatorTest,
 
   Try<Owned<cluster::Slave>> slave = StartSlave(
       detector.get(),
-      containerizer.get().get(),
+      containerizer->get(),
       flags);
 
   ASSERT_SOME(slave);

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/containerizer/fs_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/fs_tests.cpp b/src/tests/containerizer/fs_tests.cpp
index f726fb0..098f12b 100644
--- a/src/tests/containerizer/fs_tests.cpp
+++ b/src/tests/containerizer/fs_tests.cpp
@@ -72,7 +72,7 @@ TEST_F(FsTest, MountTableRead)
 
   Option<MountTable::Entry> root = None();
   Option<MountTable::Entry> proc = None();
-  foreach (const MountTable::Entry& entry, table.get().entries) {
+  foreach (const MountTable::Entry& entry, table->entries) {
     if (entry.dir == "/") {
       root = entry;
     } else if (entry.dir == "/proc") {
@@ -82,7 +82,7 @@ TEST_F(FsTest, MountTableRead)
 
   EXPECT_SOME(root);
   ASSERT_SOME(proc);
-  EXPECT_EQ("proc", proc.get().type);
+  EXPECT_EQ("proc", proc->type);
 }
 
 
@@ -93,14 +93,14 @@ TEST_F(FsTest, MountTableHasOption)
   ASSERT_SOME(table);
 
   Option<MountTable::Entry> proc = None();
-  foreach (const MountTable::Entry& entry, table.get().entries) {
+  foreach (const MountTable::Entry& entry, table->entries) {
     if (entry.dir == "/proc") {
       proc = entry;
     }
   }
 
   ASSERT_SOME(proc);
-  EXPECT_TRUE(proc.get().hasOption(MNTOPT_RW));
+  EXPECT_TRUE(proc->hasOption(MNTOPT_RW));
 }
 
 
@@ -112,16 +112,16 @@ TEST_F(FsTest, MountInfoTableParse)
   Try<MountInfoTable::Entry> entry = MountInfoTable::Entry::parse(privateMount);
 
   ASSERT_SOME(entry);
-  EXPECT_EQ(19, entry.get().id);
-  EXPECT_EQ(1, entry.get().parent);
-  EXPECT_EQ(makedev(8, 1), entry.get().devno);
-  EXPECT_EQ("/", entry.get().root);
-  EXPECT_EQ("/", entry.get().target);
-  EXPECT_EQ("rw,relatime", entry.get().vfsOptions);
-  EXPECT_EQ("rw,seclabel,data=ordered", entry.get().fsOptions);
-  EXPECT_EQ("", entry.get().optionalFields);
-  EXPECT_EQ("ext4", entry.get().type);
-  EXPECT_EQ("/dev/sda1", entry.get().source);
+  EXPECT_EQ(19, entry->id);
+  EXPECT_EQ(1, entry->parent);
+  EXPECT_EQ(makedev(8, 1), entry->devno);
+  EXPECT_EQ("/", entry->root);
+  EXPECT_EQ("/", entry->target);
+  EXPECT_EQ("rw,relatime", entry->vfsOptions);
+  EXPECT_EQ("rw,seclabel,data=ordered", entry->fsOptions);
+  EXPECT_EQ("", entry->optionalFields);
+  EXPECT_EQ("ext4", entry->type);
+  EXPECT_EQ("/dev/sda1", entry->source);
 
   // Parse a shared mount (includes one optional field).
   const string sharedMount =
@@ -129,16 +129,16 @@ TEST_F(FsTest, MountInfoTableParse)
   entry = MountInfoTable::Entry::parse(sharedMount);
 
   ASSERT_SOME(entry);
-  EXPECT_EQ(19, entry.get().id);
-  EXPECT_EQ(1, entry.get().parent);
-  EXPECT_EQ(makedev(8, 1), entry.get().devno);
-  EXPECT_EQ("/", entry.get().root);
-  EXPECT_EQ("/", entry.get().target);
-  EXPECT_EQ("rw,relatime", entry.get().vfsOptions);
-  EXPECT_EQ("rw,seclabel", entry.get().fsOptions);
-  EXPECT_EQ("shared:2", entry.get().optionalFields);
-  EXPECT_EQ("ext4", entry.get().type);
-  EXPECT_EQ("/dev/sda1", entry.get().source);
+  EXPECT_EQ(19, entry->id);
+  EXPECT_EQ(1, entry->parent);
+  EXPECT_EQ(makedev(8, 1), entry->devno);
+  EXPECT_EQ("/", entry->root);
+  EXPECT_EQ("/", entry->target);
+  EXPECT_EQ("rw,relatime", entry->vfsOptions);
+  EXPECT_EQ("rw,seclabel", entry->fsOptions);
+  EXPECT_EQ("shared:2", entry->optionalFields);
+  EXPECT_EQ("ext4", entry->type);
+  EXPECT_EQ("/dev/sda1", entry->source);
 }
 
 
@@ -150,7 +150,7 @@ TEST_F(FsTest, DISABLED_MountInfoTableRead)
 
   // Every system should have at least a rootfs mounted.
   Option<MountInfoTable::Entry> root = None();
-  foreach (const MountInfoTable::Entry& entry, table.get().entries) {
+  foreach (const MountInfoTable::Entry& entry, table->entries) {
     if (entry.target == "/") {
       root = entry;
     }
@@ -164,7 +164,7 @@ TEST_F(FsTest, DISABLED_MountInfoTableRead)
 
   // Every system should have at least a rootfs mounted.
   root = None();
-  foreach (const MountInfoTable::Entry& entry, table.get().entries) {
+  foreach (const MountInfoTable::Entry& entry, table->entries) {
     if (entry.target == "/") {
       root = entry;
     }
@@ -244,14 +244,14 @@ TEST_F(FsTest, ROOT_SharedMount)
   ASSERT_SOME(table);
 
   Option<MountInfoTable::Entry> entry;
-  foreach (const MountInfoTable::Entry& _entry, table.get().entries) {
+  foreach (const MountInfoTable::Entry& _entry, table->entries) {
     if (_entry.target == directory) {
       entry = _entry;
     }
   }
 
   ASSERT_SOME(entry);
-  EXPECT_SOME(entry.get().shared());
+  EXPECT_SOME(entry->shared());
 
   // Clean up the mount.
   EXPECT_SOME(fs::unmount(directory));
@@ -288,7 +288,7 @@ TEST_F(FsTest, ROOT_SlaveMount)
 
   Option<MountInfoTable::Entry> parent;
   Option<MountInfoTable::Entry> child;
-  foreach (const MountInfoTable::Entry& entry, table.get().entries) {
+  foreach (const MountInfoTable::Entry& entry, table->entries) {
     if (entry.target == directory) {
       ASSERT_NONE(parent);
       parent = entry;
@@ -301,9 +301,9 @@ TEST_F(FsTest, ROOT_SlaveMount)
   ASSERT_SOME(parent);
   ASSERT_SOME(child);
 
-  EXPECT_SOME(parent.get().shared());
-  EXPECT_SOME(child.get().master());
-  EXPECT_EQ(child.get().master(), parent.get().shared());
+  EXPECT_SOME(parent->shared());
+  EXPECT_SOME(child->master());
+  EXPECT_EQ(child->master(), parent->shared());
 
   // Clean up the mount.
   EXPECT_SOME(fs::unmount(target));

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/containerizer/io_switchboard_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/io_switchboard_tests.cpp b/src/tests/containerizer/io_switchboard_tests.cpp
index 9031815..a2d7c32 100644
--- a/src/tests/containerizer/io_switchboard_tests.cpp
+++ b/src/tests/containerizer/io_switchboard_tests.cpp
@@ -329,8 +329,8 @@ TEST_F(IOSwitchboardServerTest, AttachOutput)
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(http::OK().status, response);
   AWAIT_EXPECT_RESPONSE_HEADER_EQ("chunked", "Transfer-Encoding", response);
-  ASSERT_EQ(http::Response::PIPE, response.get().type);
-  ASSERT_SOME(response.get().reader);
+  ASSERT_EQ(http::Response::PIPE, response->type);
+  ASSERT_SOME(response->reader);
 
   Future<tuple<string, string>> received =
     getProcessIOData(response->reader.get());
@@ -416,9 +416,9 @@ TEST_F(IOSwitchboardServerTest, SendHeartbeat)
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(http::OK().status, response);
   AWAIT_EXPECT_RESPONSE_HEADER_EQ("chunked", "Transfer-Encoding", response);
-  ASSERT_EQ(http::Response::PIPE, response.get().type);
+  ASSERT_EQ(http::Response::PIPE, response->type);
 
-  Option<http::Pipe::Reader> reader = response.get().reader;
+  Option<http::Pipe::Reader> reader = response->reader;
   ASSERT_SOME(reader);
 
   auto deserializer = [](const string& body) {
@@ -441,7 +441,7 @@ TEST_F(IOSwitchboardServerTest, SendHeartbeat)
     // Expect for the message to have been received by now.
     ASSERT_SOME(_message.get());
 
-    agent::ProcessIO message = _message.get().get();
+    agent::ProcessIO message = _message->get();
 
     EXPECT_EQ(agent::ProcessIO::CONTROL, message.type());
 
@@ -986,7 +986,7 @@ TEST_F(IOSwitchboardTest, DISABLED_RecoverThenKillSwitchboardContainerDestroyed)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Launch a task with tty to start the switchboard server.
   TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -1036,7 +1036,7 @@ TEST_F(IOSwitchboardTest, DISABLED_RecoverThenKillSwitchboardContainerDestroyed)
   // Kill the io switchboard for the task.
   Future<hashset<ContainerID>> containers = containerizer.get()->containers();
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
   Result<pid_t> pid = paths::getContainerIOSwitchboardPid(
         flags.runtime_dir, *containers->begin());
@@ -1109,7 +1109,7 @@ TEST_F(IOSwitchboardTest, ContainerAttachAfterSlaveRestart)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   Future<TaskStatus> statusRunning;
   EXPECT_CALL(sched, statusUpdate(_, _))
@@ -1152,7 +1152,7 @@ TEST_F(IOSwitchboardTest, ContainerAttachAfterSlaveRestart)
 
   Future<hashset<ContainerID>> containers = containerizer.get()->containers();
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
   ContainerID containerId;
   containerId.set_value(containers->begin()->value());

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/containerizer/linux_filesystem_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/linux_filesystem_isolator_tests.cpp b/src/tests/containerizer/linux_filesystem_isolator_tests.cpp
index 51017a3..5e489ef 100644
--- a/src/tests/containerizer/linux_filesystem_isolator_tests.cpp
+++ b/src/tests/containerizer/linux_filesystem_isolator_tests.cpp
@@ -1193,7 +1193,7 @@ TEST_F(LinuxFilesystemIsolatorMesosTest,
       {CREATE(persistentVolume), LAUNCH({task})});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   // Wait for the ACK to be checkpointed.
   AWAIT_READY(ack);
@@ -1201,9 +1201,9 @@ TEST_F(LinuxFilesystemIsolatorMesosTest,
   Future<hashset<ContainerID>> containers = containerizer->containers();
 
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
-  ContainerID containerId = *containers.get().begin();
+  ContainerID containerId = *containers->begin();
 
   // Restart the slave.
   slave.get()->terminate();
@@ -1239,7 +1239,7 @@ TEST_F(LinuxFilesystemIsolatorMesosTest,
 
   // Verify that the orphaned container's persistent volume and
   // the rootfs are unmounted.
-  foreach (const fs::MountInfoTable::Entry& entry, table.get().entries) {
+  foreach (const fs::MountInfoTable::Entry& entry, table->entries) {
     EXPECT_FALSE(strings::contains(entry.target, directory))
       << "Target was not unmounted: " << entry.target;
   }

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/containerizer/memory_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/memory_isolator_tests.cpp b/src/tests/containerizer/memory_isolator_tests.cpp
index 388e62a..0df4aa8 100644
--- a/src/tests/containerizer/memory_isolator_tests.cpp
+++ b/src/tests/containerizer/memory_isolator_tests.cpp
@@ -106,7 +106,7 @@ TEST_P(MemoryIsolatorTest, ROOT_MemUsage)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(offers.get()[0], "sleep 120");
 
@@ -117,20 +117,20 @@ TEST_P(MemoryIsolatorTest, ROOT_MemUsage)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(statusRunning);
-  EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
+  EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 
   Future<hashset<ContainerID>> containers = containerizer->containers();
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
-  ContainerID containerId = *(containers.get().begin());
+  ContainerID containerId = *(containers->begin());
 
   Future<ResourceStatistics> usage = containerizer->usage(containerId);
   AWAIT_READY(usage);
 
   // TODO(jieyu): Consider using a program that predictably increases
   // RSS so that we can set more meaningful expectation here.
-  EXPECT_LT(0u, usage.get().mem_rss_bytes());
+  EXPECT_LT(0u, usage->mem_rss_bytes());
 
   driver.stop();
   driver.join();

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/containerizer/memory_pressure_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/memory_pressure_tests.cpp b/src/tests/containerizer/memory_pressure_tests.cpp
index ff6c2b6..f046360 100644
--- a/src/tests/containerizer/memory_pressure_tests.cpp
+++ b/src/tests/containerizer/memory_pressure_tests.cpp
@@ -114,7 +114,7 @@ TEST_F(MemoryPressureMesosTest, CGROUPS_ROOT_Statistics)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   Offer offer = offers.get()[0];
 
@@ -135,14 +135,14 @@ TEST_F(MemoryPressureMesosTest, CGROUPS_ROOT_Statistics)
   driver.launchTasks(offer.id(), {task});
 
   AWAIT_READY(running);
-  EXPECT_EQ(task.task_id(), running.get().task_id());
-  EXPECT_EQ(TASK_RUNNING, running.get().state());
+  EXPECT_EQ(task.task_id(), running->task_id());
+  EXPECT_EQ(TASK_RUNNING, running->state());
 
   Future<hashset<ContainerID>> containers = containerizer->containers();
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
-  ContainerID containerId = *(containers.get().begin());
+  ContainerID containerId = *(containers->begin());
 
   // Wait a while for some memory pressure events to occur.
   Duration waited = Duration::zero();
@@ -150,7 +150,7 @@ TEST_F(MemoryPressureMesosTest, CGROUPS_ROOT_Statistics)
     Future<ResourceStatistics> usage = containerizer->usage(containerId);
     AWAIT_READY(usage);
 
-    if (usage.get().mem_low_pressure_counter() > 0) {
+    if (usage->mem_low_pressure_counter() > 0) {
       // We will check the correctness of the memory pressure counters
       // later, because the memory-hammering task is still active
       // and potentially incrementing these counters.
@@ -179,10 +179,10 @@ TEST_F(MemoryPressureMesosTest, CGROUPS_ROOT_Statistics)
   Future<ResourceStatistics> usage = containerizer->usage(containerId);
   AWAIT_READY(usage);
 
-  EXPECT_GE(usage.get().mem_low_pressure_counter(),
-            usage.get().mem_medium_pressure_counter());
-  EXPECT_GE(usage.get().mem_medium_pressure_counter(),
-            usage.get().mem_critical_pressure_counter());
+  EXPECT_GE(usage->mem_low_pressure_counter(),
+            usage->mem_medium_pressure_counter());
+  EXPECT_GE(usage->mem_medium_pressure_counter(),
+            usage->mem_critical_pressure_counter());
 
   Clock::resume();
 
@@ -236,7 +236,7 @@ TEST_F(MemoryPressureMesosTest, CGROUPS_ROOT_SlaveRecovery)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   Offer offer = offers.get()[0];
 
@@ -258,8 +258,8 @@ TEST_F(MemoryPressureMesosTest, CGROUPS_ROOT_SlaveRecovery)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(running);
-  EXPECT_EQ(task.task_id(), running.get().task_id());
-  EXPECT_EQ(TASK_RUNNING, running.get().state());
+  EXPECT_EQ(task.task_id(), running->task_id());
+  EXPECT_EQ(TASK_RUNNING, running->state());
 
   // Wait for the ACK to be checkpointed.
   AWAIT_READY_FOR(_statusUpdateAcknowledgement, Seconds(120));
@@ -290,9 +290,9 @@ TEST_F(MemoryPressureMesosTest, CGROUPS_ROOT_SlaveRecovery)
 
   Future<hashset<ContainerID>> containers = containerizer->containers();
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
-  ContainerID containerId = *(containers.get().begin());
+  ContainerID containerId = *(containers->begin());
 
   // Wait a while for some memory pressure events to occur.
   Duration waited = Duration::zero();
@@ -300,7 +300,7 @@ TEST_F(MemoryPressureMesosTest, CGROUPS_ROOT_SlaveRecovery)
     Future<ResourceStatistics> usage = containerizer->usage(containerId);
     AWAIT_READY(usage);
 
-    if (usage.get().mem_low_pressure_counter() > 0) {
+    if (usage->mem_low_pressure_counter() > 0) {
       // We will check the correctness of the memory pressure counters
       // later, because the memory-hammering task is still active
       // and potentially incrementing these counters.
@@ -333,10 +333,10 @@ TEST_F(MemoryPressureMesosTest, CGROUPS_ROOT_SlaveRecovery)
   Future<ResourceStatistics> usage = containerizer->usage(containerId);
   AWAIT_READY(usage);
 
-  EXPECT_GE(usage.get().mem_low_pressure_counter(),
-            usage.get().mem_medium_pressure_counter());
-  EXPECT_GE(usage.get().mem_medium_pressure_counter(),
-            usage.get().mem_critical_pressure_counter());
+  EXPECT_GE(usage->mem_low_pressure_counter(),
+            usage->mem_medium_pressure_counter());
+  EXPECT_GE(usage->mem_medium_pressure_counter(),
+            usage->mem_critical_pressure_counter());
 
   Clock::resume();
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/containerizer/mesos_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/mesos_containerizer_tests.cpp b/src/tests/containerizer/mesos_containerizer_tests.cpp
index 683807f..ec9f354 100644
--- a/src/tests/containerizer/mesos_containerizer_tests.cpp
+++ b/src/tests/containerizer/mesos_containerizer_tests.cpp
@@ -1309,7 +1309,7 @@ TEST_F(MesosContainerizerRecoverTest, SkipRecoverNonMesosContainers)
 
   Future<hashset<ContainerID>> containers = containerizer.get()->containers();
   AWAIT_READY(containers);
-  EXPECT_EQ(0u, containers.get().size());
+  EXPECT_EQ(0u, containers->size());
 }
 
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/containerizer/nested_mesos_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/nested_mesos_containerizer_tests.cpp b/src/tests/containerizer/nested_mesos_containerizer_tests.cpp
index fa56d6e..2900789 100644
--- a/src/tests/containerizer/nested_mesos_containerizer_tests.cpp
+++ b/src/tests/containerizer/nested_mesos_containerizer_tests.cpp
@@ -571,7 +571,7 @@ TEST_F(NestedMesosContainerizerTest,
 
   Future<hashset<ContainerID>> containers = containerizer.get()->containers();
   AWAIT_READY(containers);
-  EXPECT_EQ(2u, containers.get().size());
+  EXPECT_EQ(2u, containers->size());
 
   Future<Option<ContainerTermination>> wait =
     containerizer->wait(nestedContainerId);

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/containerizer/ns_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/ns_tests.cpp b/src/tests/containerizer/ns_tests.cpp
index d6be107..0c74896 100644
--- a/src/tests/containerizer/ns_tests.cpp
+++ b/src/tests/containerizer/ns_tests.cpp
@@ -98,7 +98,7 @@ TEST(NsTest, ROOT_setns)
   ASSERT_SOME(s);
 
   // The child should exit 0.
-  AWAIT_EXPECT_WEXITSTATUS_EQ(0, s.get().status());
+  AWAIT_EXPECT_WEXITSTATUS_EQ(0, s->status());
 }
 
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/containerizer/port_mapping_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/port_mapping_tests.cpp b/src/tests/containerizer/port_mapping_tests.cpp
index 3e84816..eb183f2 100644
--- a/src/tests/containerizer/port_mapping_tests.cpp
+++ b/src/tests/containerizer/port_mapping_tests.cpp
@@ -249,7 +249,7 @@ protected:
       << "Failed to retrieve the host public IP network from " << eth0 << ": "
       << hostIPNetwork.error();
 
-    hostIP = hostIPNetwork.get().address();
+    hostIP = hostIPNetwork->address();
 
     // Get all the external name servers for tests that need to talk
     // to an external host, e.g., ping, DNS.
@@ -388,11 +388,11 @@ protected:
       return Error(s.error());
     }
 
-    Future<Option<int>> status = s.get().status();
+    Future<Option<int>> status = s->status();
     AWAIT_EXPECT_READY(status);
     EXPECT_SOME_EQ(0, status.get());
 
-    Future<string> out = io::read(s.get().out().get());
+    Future<string> out = io::read(s->out().get());
     AWAIT_EXPECT_READY(out);
 
     Try<JSON::Object> object = JSON::parse<JSON::Object>(out.get());
@@ -1604,7 +1604,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_SmallEgressLimit)
   ASSERT_GT(time.get(), (size.bytes() / rate.bytes()));
 
   // Make sure the nc server exits normally.
-  Future<Option<int>> status = s.get().status();
+  Future<Option<int>> status = s->status();
   AWAIT_READY(status);
   EXPECT_SOME_EQ(0, status.get());
 
@@ -1761,9 +1761,9 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_PortMappingStatistics)
     Future<ResourceStatistics> usage = isolator.get()->usage(containerId);
     AWAIT_READY(usage);
 
-    if (usage.get().has_net_tcp_rtt_microsecs_p50() &&
-        usage.get().has_net_tcp_active_connections()) {
-      EXPECT_GT(usage.get().net_tcp_active_connections(), 0);
+    if (usage->has_net_tcp_rtt_microsecs_p50() &&
+        usage->has_net_tcp_active_connections()) {
+      EXPECT_GT(usage->net_tcp_active_connections(), 0);
       break;
     }
   } while (waited < Seconds(5));
@@ -1800,7 +1800,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_PortMappingStatistics)
   ASSERT_TRUE(waitForFileCreation(container1Ready));
 
   // Make sure the nc server exits normally.
-  Future<Option<int>> status = s.get().status();
+  Future<Option<int>> status = s->status();
   AWAIT_READY(status);
   EXPECT_SOME_EQ(0, status.get());
 
@@ -1914,7 +1914,7 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_RecoverMixedContainers)
   driver.start();
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
 
   Offer offer1 = offers1.get()[0];
 
@@ -1971,7 +1971,7 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_RecoverMixedContainers)
   Clock::resume();
 
   AWAIT_READY(offers2);
-  EXPECT_NE(0u, offers2.get().size());
+  EXPECT_NE(0u, offers2->size());
 
   Offer offer2 = offers2.get()[0];
 
@@ -2020,7 +2020,7 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_RecoverMixedContainers)
   // were recovered.
   Future<hashset<ContainerID>> containers = containerizer.get()->containers();
   AWAIT_READY(containers);
-  EXPECT_EQ(2u, containers.get().size());
+  EXPECT_EQ(2u, containers->size());
 
   foreach (const ContainerID& containerId, containers.get()) {
     // Do some basic checks to make sure the network isolator can
@@ -2081,7 +2081,7 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_CleanUpOrphan)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Start a long running task using network islator.
   TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -2099,9 +2099,9 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_CleanUpOrphan)
   Future<hashset<ContainerID>> containers = containerizer->containers();
 
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
-  ContainerID containerId = *containers.get().begin();
+  ContainerID containerId = *containers->begin();
 
   slave.get()->terminate();
 
@@ -2140,11 +2140,11 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_CleanUpOrphan)
     ip::classifiers(eth0, ingress::HANDLE);
 
   EXPECT_SOME(classifiers);
-  EXPECT_EQ(0u, classifiers.get().size());
+  EXPECT_EQ(0u, classifiers->size());
 
   classifiers = ip::classifiers(lo, ingress::HANDLE);
   EXPECT_SOME(classifiers);
-  EXPECT_EQ(0u, classifiers.get().size());
+  EXPECT_EQ(0u, classifiers->size());
 
   // Expect no 'veth' devices.
   Try<set<string>> links = net::links();
@@ -2156,7 +2156,7 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_CleanUpOrphan)
   // Expect no files in bind mount directory.
   Try<list<string>> files = os::ls(slave::PORT_MAPPING_BIND_MOUNT_ROOT());
   ASSERT_SOME(files);
-  EXPECT_EQ(0u, files.get().size());
+  EXPECT_EQ(0u, files->size());
 
   driver.stop();
   driver.join();
@@ -2200,7 +2200,7 @@ TEST_F(PortMappingMesosTest, ROOT_NetworkNamespaceHandleSymlink)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Start a long running task using network islator.
   TaskInfo task = createTask(offers.get()[0], "sleep 1000");
@@ -2215,14 +2215,14 @@ TEST_F(PortMappingMesosTest, ROOT_NetworkNamespaceHandleSymlink)
   driver.launchTasks(offers.get()[0].id(), {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());
 
   Future<hashset<ContainerID>> containers = containerizer->containers();
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
-  ContainerID containerId = *(containers.get().begin());
+  ContainerID containerId = *(containers->begin());
 
   const string symlink = path::join(
       slave::PORT_MAPPING_BIND_MOUNT_SYMLINK_ROOT(),
@@ -2237,8 +2237,8 @@ TEST_F(PortMappingMesosTest, ROOT_NetworkNamespaceHandleSymlink)
   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());
 
   AWAIT_READY(termination);
   EXPECT_SOME(termination.get());
@@ -2291,7 +2291,7 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_RecoverMixedKnownAndUnKnownOrphans)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   Offer offer = offers.get()[0];
 
@@ -2315,17 +2315,17 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_RecoverMixedKnownAndUnKnownOrphans)
   driver.launchTasks(offers.get()[0].id(), {task1, task2});
 
   AWAIT_READY(status1);
-  ASSERT_EQ(TASK_RUNNING, status1.get().state());
+  ASSERT_EQ(TASK_RUNNING, status1->state());
 
   AWAIT_READY(status2);
-  ASSERT_EQ(TASK_RUNNING, status2.get().state());
+  ASSERT_EQ(TASK_RUNNING, status2->state());
 
   // Obtain the container IDs.
   Future<hashset<ContainerID>> containers = containerizer->containers();
   AWAIT_READY(containers);
-  ASSERT_EQ(2u, containers.get().size());
+  ASSERT_EQ(2u, containers->size());
 
-  auto iterator = containers.get().begin();
+  auto iterator = containers->begin();
   const ContainerID containerId1 = *iterator;
   const ContainerID containerId2 = *(++iterator);
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/containerizer/provisioner_appc_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/provisioner_appc_tests.cpp b/src/tests/containerizer/provisioner_appc_tests.cpp
index eb6509b..4342793 100644
--- a/src/tests/containerizer/provisioner_appc_tests.cpp
+++ b/src/tests/containerizer/provisioner_appc_tests.cpp
@@ -268,11 +268,11 @@ TEST_F(AppcStoreTest, Recover)
   Future<slave::ImageInfo> ImageInfo = store.get()->get(image, COPY_BACKEND);
   AWAIT_READY(ImageInfo);
 
-  EXPECT_EQ(1u, ImageInfo.get().layers.size());
+  EXPECT_EQ(1u, ImageInfo->layers.size());
   ASSERT_SOME(os::realpath(imagePath));
   EXPECT_EQ(
       os::realpath(path::join(imagePath, "rootfs")).get(),
-      ImageInfo.get().layers.front());
+      ImageInfo->layers.front());
 }
 
 
@@ -332,7 +332,7 @@ TEST_F(ProvisionerAppcTest, ROOT_Provision)
   ASSERT_TRUE(rootfses->contains(flags.image_provisioner_backend.get()));
   ASSERT_EQ(1u, rootfses->get(flags.image_provisioner_backend.get())->size());
   EXPECT_EQ(*rootfses->get(flags.image_provisioner_backend.get())->begin(),
-            Path(provisionInfo.get().rootfs).basename());
+            Path(provisionInfo->rootfs).basename());
 
   Future<bool> destroy = provisioner.get()->destroy(containerId);
   AWAIT_READY(destroy);
@@ -400,7 +400,7 @@ TEST_F(ProvisionerAppcTest, ROOT_ProvisionNestedContainer)
   ASSERT_TRUE(rootfses->contains(flags.image_provisioner_backend.get()));
   ASSERT_EQ(1u, rootfses->get(flags.image_provisioner_backend.get())->size());
   EXPECT_EQ(*rootfses->get(flags.image_provisioner_backend.get())->begin(),
-            Path(provisionInfo.get().rootfs).basename());
+            Path(provisionInfo->rootfs).basename());
 
   // TODO(jieyu): Verify that 'containerDir' is nested under its
   // parent container's 'containerDir'.
@@ -795,7 +795,7 @@ TEST_F(AppcImageFetcherTest, CURL_SimpleHttpFetch)
   slave::Flags flags;
 
   Try<Owned<slave::appc::Fetcher>> fetcher =
-    slave::appc::Fetcher::create(flags, uriFetcher.get().share());
+    slave::appc::Fetcher::create(flags, uriFetcher->share());
 
   ASSERT_SOME(fetcher);
 
@@ -813,12 +813,12 @@ TEST_F(AppcImageFetcherTest, CURL_SimpleHttpFetch)
   ASSERT_SOME(imageDirs);
 
   // Verify that there is only ONE image directory.
-  ASSERT_EQ(1u, imageDirs.get().size());
+  ASSERT_EQ(1u, imageDirs->size());
 
   // Verify that there is a roofs.
   const Path imageRootfs(path::join(
       imageFetchDir,
-      imageDirs.get().front(),
+      imageDirs->front(),
       "rootfs"));
 
   ASSERT_TRUE(os::exists(imageRootfs));
@@ -855,7 +855,7 @@ TEST_F(AppcImageFetcherTest, SimpleFileFetch)
   flags.appc_simple_discovery_uri_prefix = imageDirMountPath + "/";
 
   Try<Owned<slave::appc::Fetcher>> fetcher =
-    slave::appc::Fetcher::create(flags, uriFetcher.get().share());
+    slave::appc::Fetcher::create(flags, uriFetcher->share());
 
   ASSERT_SOME(fetcher);
 
@@ -873,12 +873,12 @@ TEST_F(AppcImageFetcherTest, SimpleFileFetch)
   ASSERT_SOME(imageDirs);
 
   // Verify that there is only ONE image directory.
-  ASSERT_EQ(1u, imageDirs.get().size());
+  ASSERT_EQ(1u, imageDirs->size());
 
   // Verify that there is a roofs.
   const Path imageRootfs(path::join(
       imageFetchDir,
-      imageDirs.get().front(),
+      imageDirs->front(),
       "rootfs"));
 
   ASSERT_TRUE(os::exists(imageRootfs));

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/containerizer/provisioner_backend_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/provisioner_backend_tests.cpp b/src/tests/containerizer/provisioner_backend_tests.cpp
index ab7805f..e3516fc 100644
--- a/src/tests/containerizer/provisioner_backend_tests.cpp
+++ b/src/tests/containerizer/provisioner_backend_tests.cpp
@@ -64,7 +64,7 @@ protected:
 
     // TODO(xujyan): Make sandbox a plain string instead of an option.
     ASSERT_SOME(sandbox);
-    foreach (const fs::MountInfoTable::Entry& entry, mountTable.get().entries) {
+    foreach (const fs::MountInfoTable::Entry& entry, mountTable->entries) {
       if (strings::startsWith(entry.target, sandbox.get())) {
         fs::unmount(entry.target, MNT_DETACH);
       }

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/containerizer/provisioner_docker_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/provisioner_docker_tests.cpp b/src/tests/containerizer/provisioner_docker_tests.cpp
index d1eec05..8c295fe 100644
--- a/src/tests/containerizer/provisioner_docker_tests.cpp
+++ b/src/tests/containerizer/provisioner_docker_tests.cpp
@@ -203,7 +203,7 @@ TEST_F(ProvisionerDockerLocalStoreTest, LocalStoreTestWithTar)
 
   AWAIT_READY(imageInfo);
 
-  verifyLocalDockerImage(flags, imageInfo.get().layers);
+  verifyLocalDockerImage(flags, imageInfo->layers);
 }
 
 
@@ -228,7 +228,7 @@ TEST_F(ProvisionerDockerLocalStoreTest, MetadataManagerInitialization)
 
   // Store is deleted and recreated. Metadata Manager is initialized upon
   // creation of the store.
-  store.get().reset();
+  store->reset();
   store = slave::docker::Store::create(flags);
   ASSERT_SOME(store);
   Future<Nothing> recover = store.get()->recover();
@@ -236,7 +236,7 @@ TEST_F(ProvisionerDockerLocalStoreTest, MetadataManagerInitialization)
 
   imageInfo = store.get()->get(image, COPY_BACKEND);
   AWAIT_READY(imageInfo);
-  verifyLocalDockerImage(flags, imageInfo.get().layers);
+  verifyLocalDockerImage(flags, imageInfo->layers);
 }
 
 
@@ -363,7 +363,7 @@ TEST_F(ProvisionerDockerLocalStoreTest, PullingSameImageSimutanuously)
   AWAIT_READY(imageInfo1);
   AWAIT_READY(imageInfo2);
 
-  EXPECT_EQ(imageInfo1.get().layers, imageInfo2.get().layers);
+  EXPECT_EQ(imageInfo1->layers, imageInfo2->layers);
 }
 
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/containerizer/routing_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/routing_tests.cpp b/src/tests/containerizer/routing_tests.cpp
index e6b7ead..d05b3b1 100644
--- a/src/tests/containerizer/routing_tests.cpp
+++ b/src/tests/containerizer/routing_tests.cpp
@@ -83,30 +83,30 @@ TEST_F(RoutingTest, PortRange)
 
   ports = ip::PortRange::fromBeginEnd(4, 7);
   ASSERT_SOME(ports);
-  EXPECT_EQ(4u, ports.get().begin());
-  EXPECT_EQ(7u, ports.get().end());
-  EXPECT_EQ(0xfffc, ports.get().mask());
+  EXPECT_EQ(4u, ports->begin());
+  EXPECT_EQ(7u, ports->end());
+  EXPECT_EQ(0xfffc, ports->mask());
   EXPECT_EQ("[4,7]", stringify(ports.get()));
 
   ports = ip::PortRange::fromBeginEnd(10, 10);
   ASSERT_SOME(ports);
-  EXPECT_EQ(10u, ports.get().begin());
-  EXPECT_EQ(10u, ports.get().end());
-  EXPECT_EQ(0xffff, ports.get().mask());
+  EXPECT_EQ(10u, ports->begin());
+  EXPECT_EQ(10u, ports->end());
+  EXPECT_EQ(0xffff, ports->mask());
   EXPECT_EQ("[10,10]", stringify(ports.get()));
 
   ports = ip::PortRange::fromBeginMask(20, 0xffff);
   ASSERT_SOME(ports);
-  EXPECT_EQ(20u, ports.get().begin());
-  EXPECT_EQ(20u, ports.get().end());
-  EXPECT_EQ(0xffff, ports.get().mask());
+  EXPECT_EQ(20u, ports->begin());
+  EXPECT_EQ(20u, ports->end());
+  EXPECT_EQ(0xffff, ports->mask());
   EXPECT_EQ("[20,20]", stringify(ports.get()));
 
   ports = ip::PortRange::fromBeginMask(1024, 0xfff8);
   ASSERT_SOME(ports);
-  EXPECT_EQ(1024u, ports.get().begin());
-  EXPECT_EQ(1031u, ports.get().end());
-  EXPECT_EQ(0xfff8, ports.get().mask());
+  EXPECT_EQ(1024u, ports->begin());
+  EXPECT_EQ(1031u, ports->end());
+  EXPECT_EQ(0xfff8, ports->mask());
   EXPECT_EQ("[1024,1031]", stringify(ports.get()));
 }
 
@@ -145,10 +145,10 @@ TEST_F(RoutingTest, LinkStatistics)
     Result<hashmap<string, uint64_t>> statistics = link::statistics(link);
 
     ASSERT_SOME(statistics);
-    EXPECT_TRUE(statistics.get().contains("rx_packets"));
-    EXPECT_TRUE(statistics.get().contains("rx_bytes"));
-    EXPECT_TRUE(statistics.get().contains("tx_packets"));
-    EXPECT_TRUE(statistics.get().contains("tx_bytes"));
+    EXPECT_TRUE(statistics->contains("rx_packets"));
+    EXPECT_TRUE(statistics->contains("rx_bytes"));
+    EXPECT_TRUE(statistics->contains("tx_packets"));
+    EXPECT_TRUE(statistics->contains("tx_bytes"));
   }
 
   EXPECT_NONE(link::statistics("not-exist"));
@@ -447,15 +447,15 @@ TEST_F(RoutingVethTest, ROOT_IngressQdisc)
   // Interfaces which exist return at least the core statisitcs.
   Result<hashmap<string, uint64_t>> stats = ingress::statistics(TEST_VETH_LINK);
   ASSERT_SOME(stats);
-  EXPECT_TRUE(stats.get().contains(statistics::PACKETS));
-  EXPECT_TRUE(stats.get().contains(statistics::BYTES));
-  EXPECT_TRUE(stats.get().contains(statistics::RATE_BPS));
-  EXPECT_TRUE(stats.get().contains(statistics::RATE_PPS));
-  EXPECT_TRUE(stats.get().contains(statistics::QLEN));
-  EXPECT_TRUE(stats.get().contains(statistics::BACKLOG));
-  EXPECT_TRUE(stats.get().contains(statistics::DROPS));
-  EXPECT_TRUE(stats.get().contains(statistics::REQUEUES));
-  EXPECT_TRUE(stats.get().contains(statistics::OVERLIMITS));
+  EXPECT_TRUE(stats->contains(statistics::PACKETS));
+  EXPECT_TRUE(stats->contains(statistics::BYTES));
+  EXPECT_TRUE(stats->contains(statistics::RATE_BPS));
+  EXPECT_TRUE(stats->contains(statistics::RATE_PPS));
+  EXPECT_TRUE(stats->contains(statistics::QLEN));
+  EXPECT_TRUE(stats->contains(statistics::BACKLOG));
+  EXPECT_TRUE(stats->contains(statistics::DROPS));
+  EXPECT_TRUE(stats->contains(statistics::REQUEUES));
+  EXPECT_TRUE(stats->contains(statistics::OVERLIMITS));
 
   // Interface without qdisc returns no data.
   EXPECT_NONE(ingress::statistics(TEST_PEER_LINK));
@@ -515,15 +515,15 @@ TEST_F(RoutingVethTest, ROOT_HTBQdisc)
   Result<hashmap<string, uint64_t>> stats =
       htb::statistics(TEST_VETH_LINK, EGRESS_ROOT);
   ASSERT_SOME(stats);
-  EXPECT_TRUE(stats.get().contains(statistics::PACKETS));
-  EXPECT_TRUE(stats.get().contains(statistics::BYTES));
-  EXPECT_TRUE(stats.get().contains(statistics::RATE_BPS));
-  EXPECT_TRUE(stats.get().contains(statistics::RATE_PPS));
-  EXPECT_TRUE(stats.get().contains(statistics::QLEN));
-  EXPECT_TRUE(stats.get().contains(statistics::BACKLOG));
-  EXPECT_TRUE(stats.get().contains(statistics::DROPS));
-  EXPECT_TRUE(stats.get().contains(statistics::REQUEUES));
-  EXPECT_TRUE(stats.get().contains(statistics::OVERLIMITS));
+  EXPECT_TRUE(stats->contains(statistics::PACKETS));
+  EXPECT_TRUE(stats->contains(statistics::BYTES));
+  EXPECT_TRUE(stats->contains(statistics::RATE_BPS));
+  EXPECT_TRUE(stats->contains(statistics::RATE_PPS));
+  EXPECT_TRUE(stats->contains(statistics::QLEN));
+  EXPECT_TRUE(stats->contains(statistics::BACKLOG));
+  EXPECT_TRUE(stats->contains(statistics::DROPS));
+  EXPECT_TRUE(stats->contains(statistics::REQUEUES));
+  EXPECT_TRUE(stats->contains(statistics::OVERLIMITS));
 
   // Interface without htb qdisc returns no data.
   EXPECT_NONE(htb::statistics(TEST_PEER_LINK, EGRESS_ROOT));
@@ -599,15 +599,15 @@ TEST_F(RoutingVethTest, ROOT_FqCodeQdisc)
   Result<hashmap<string, uint64_t>> stats =
       fq_codel::statistics(TEST_VETH_LINK, EGRESS_ROOT);
   ASSERT_SOME(stats);
-  EXPECT_TRUE(stats.get().contains(statistics::PACKETS));
-  EXPECT_TRUE(stats.get().contains(statistics::BYTES));
-  EXPECT_TRUE(stats.get().contains(statistics::RATE_BPS));
-  EXPECT_TRUE(stats.get().contains(statistics::RATE_PPS));
-  EXPECT_TRUE(stats.get().contains(statistics::QLEN));
-  EXPECT_TRUE(stats.get().contains(statistics::BACKLOG));
-  EXPECT_TRUE(stats.get().contains(statistics::DROPS));
-  EXPECT_TRUE(stats.get().contains(statistics::REQUEUES));
-  EXPECT_TRUE(stats.get().contains(statistics::OVERLIMITS));
+  EXPECT_TRUE(stats->contains(statistics::PACKETS));
+  EXPECT_TRUE(stats->contains(statistics::BYTES));
+  EXPECT_TRUE(stats->contains(statistics::RATE_BPS));
+  EXPECT_TRUE(stats->contains(statistics::RATE_PPS));
+  EXPECT_TRUE(stats->contains(statistics::QLEN));
+  EXPECT_TRUE(stats->contains(statistics::BACKLOG));
+  EXPECT_TRUE(stats->contains(statistics::DROPS));
+  EXPECT_TRUE(stats->contains(statistics::REQUEUES));
+  EXPECT_TRUE(stats->contains(statistics::OVERLIMITS));
 
   // Interface without fq_codel qdisc returns no data.
   EXPECT_NONE(fq_codel::statistics(TEST_PEER_LINK, EGRESS_ROOT));
@@ -863,8 +863,8 @@ TEST_F(RoutingVethTest, ROOT_ICMPFilterCreate)
     icmp::classifiers(TEST_VETH_LINK, ingress::HANDLE);
 
   ASSERT_SOME(classifiers);
-  ASSERT_EQ(1u, classifiers.get().size());
-  EXPECT_SOME_EQ(ip, classifiers.get().front().destinationIP);
+  ASSERT_EQ(1u, classifiers->size());
+  EXPECT_SOME_EQ(ip, classifiers->front().destinationIP);
 }
 
 
@@ -931,9 +931,9 @@ TEST_F(RoutingVethTest, ROOT_ICMPFilterCreateMultiple)
     icmp::classifiers(TEST_VETH_LINK, ingress::HANDLE);
 
   ASSERT_SOME(classifiers);
-  ASSERT_EQ(2u, classifiers.get().size());
-  EXPECT_SOME_EQ(ip1, classifiers.get().front().destinationIP);
-  EXPECT_SOME_EQ(ip2, classifiers.get().back().destinationIP);
+  ASSERT_EQ(2u, classifiers->size());
+  EXPECT_SOME_EQ(ip1, classifiers->front().destinationIP);
+  EXPECT_SOME_EQ(ip2, classifiers->back().destinationIP);
 }
 
 
@@ -1071,17 +1071,17 @@ TEST_F(RoutingVethTest, ROOT_IPFilterCreate)
     ip::classifiers(TEST_VETH_LINK, ingress::HANDLE);
 
   ASSERT_SOME(classifiers);
-  ASSERT_EQ(1u, classifiers.get().size());
-  EXPECT_SOME_EQ(mac.get(), classifiers.get().front().destinationMAC);
-  EXPECT_SOME_EQ(ip, classifiers.get().front().destinationIP);
+  ASSERT_EQ(1u, classifiers->size());
+  EXPECT_SOME_EQ(mac.get(), classifiers->front().destinationMAC);
+  EXPECT_SOME_EQ(ip, classifiers->front().destinationIP);
 
   EXPECT_SOME_EQ(
       sourcePorts.get(),
-      classifiers.get().front().sourcePorts);
+      classifiers->front().sourcePorts);
 
   EXPECT_SOME_EQ(
       destinationPorts.get(),
-      classifiers.get().front().destinationPorts);
+      classifiers->front().destinationPorts);
 }
 
 
@@ -1112,11 +1112,11 @@ TEST_F(RoutingVethTest, ROOT_IPFilterCreate2)
     ip::classifiers(TEST_VETH_LINK, ingress::HANDLE);
 
   ASSERT_SOME(classifiers);
-  ASSERT_EQ(1u, classifiers.get().size());
-  EXPECT_NONE(classifiers.get().front().destinationMAC);
-  EXPECT_SOME_EQ(ip, classifiers.get().front().destinationIP);
-  EXPECT_NONE(classifiers.get().front().sourcePorts);
-  EXPECT_NONE(classifiers.get().front().destinationPorts);
+  ASSERT_EQ(1u, classifiers->size());
+  EXPECT_NONE(classifiers->front().destinationMAC);
+  EXPECT_SOME_EQ(ip, classifiers->front().destinationIP);
+  EXPECT_NONE(classifiers->front().sourcePorts);
+  EXPECT_NONE(classifiers->front().destinationPorts);
 }
 
 
@@ -1235,29 +1235,29 @@ TEST_F(RoutingVethTest, ROOT_IPFilterCreateMultiple)
     ip::classifiers(TEST_VETH_LINK, ingress::HANDLE);
 
   ASSERT_SOME(classifiers);
-  ASSERT_EQ(2u, classifiers.get().size());
+  ASSERT_EQ(2u, classifiers->size());
 
-  EXPECT_SOME_EQ(mac.get(), classifiers.get().front().destinationMAC);
-  EXPECT_SOME_EQ(ip, classifiers.get().front().destinationIP);
+  EXPECT_SOME_EQ(mac.get(), classifiers->front().destinationMAC);
+  EXPECT_SOME_EQ(ip, classifiers->front().destinationIP);
 
   EXPECT_SOME_EQ(
       sourcePorts1.get(),
-      classifiers.get().front().sourcePorts);
+      classifiers->front().sourcePorts);
 
   EXPECT_SOME_EQ(
       destinationPorts1.get(),
-      classifiers.get().front().destinationPorts);
+      classifiers->front().destinationPorts);
 
-  EXPECT_SOME_EQ(mac.get(), classifiers.get().back().destinationMAC);
-  EXPECT_SOME_EQ(ip, classifiers.get().back().destinationIP);
+  EXPECT_SOME_EQ(mac.get(), classifiers->back().destinationMAC);
+  EXPECT_SOME_EQ(ip, classifiers->back().destinationIP);
 
   EXPECT_SOME_EQ(
       sourcePorts2.get(),
-      classifiers.get().back().sourcePorts);
+      classifiers->back().sourcePorts);
 
   EXPECT_SOME_EQ(
       destinationPorts2.get(),
-      classifiers.get().back().destinationPorts);
+      classifiers->back().destinationPorts);
 }
 
 
@@ -1333,7 +1333,7 @@ TEST_F(RoutingVethTest, ROOT_IPFilterRemove)
     ip::classifiers(TEST_VETH_LINK, ingress::HANDLE);
 
   ASSERT_SOME(classifiers);
-  EXPECT_EQ(0u, classifiers.get().size());
+  EXPECT_EQ(0u, classifiers->size());
 }
 
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/containerizer/xfs_quota_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/xfs_quota_tests.cpp b/src/tests/containerizer/xfs_quota_tests.cpp
index bb19311..241f449 100644
--- a/src/tests/containerizer/xfs_quota_tests.cpp
+++ b/src/tests/containerizer/xfs_quota_tests.cpp
@@ -257,8 +257,8 @@ TEST_F(ROOT_XFS_QuotaTest, QuotaGetSet)
   Result<QuotaInfo> info = getProjectQuota(root, projectId);
   ASSERT_SOME(info);
 
-  EXPECT_EQ(limit, info.get().limit);
-  EXPECT_EQ(Bytes(0), info.get().used);
+  EXPECT_EQ(limit, info->limit);
+  EXPECT_EQ(Bytes(0), info->used);
 
   EXPECT_SOME(clearProjectQuota(root, projectId));
 }
@@ -402,7 +402,7 @@ TEST_F(ROOT_XFS_QuotaTest, DiskUsageExceedsQuota)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_FALSE(offers.get().empty());
+  EXPECT_FALSE(offers->empty());
 
   const Offer& offer = offers.get()[0];
 
@@ -422,17 +422,17 @@ TEST_F(ROOT_XFS_QuotaTest, DiskUsageExceedsQuota)
   driver.launchTasks(offer.id(), {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_FAILED, status2.get().state());
+  EXPECT_EQ(task.task_id(), status2->task_id());
+  EXPECT_EQ(TASK_FAILED, status2->state());
 
   // Unlike the 'disk/du' isolator, the reason for task failure
   // should be that dd got an IO error.
-  EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, status2.get().source());
-  EXPECT_EQ("Command exited with status 1", status2.get().message());
+  EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, status2->source());
+  EXPECT_EQ("Command exited with status 1", status2->message());
 
   driver.stop();
   driver.join();
@@ -475,7 +475,7 @@ TEST_F(ROOT_XFS_QuotaTest, ResourceStatistics)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_FALSE(offers.get().empty());
+  EXPECT_FALSE(offers->empty());
 
   Offer offer = offers.get()[0];
 
@@ -494,33 +494,33 @@ TEST_F(ROOT_XFS_QuotaTest, ResourceStatistics)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(task.task_id(), status.get().task_id());
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(task.task_id(), status->task_id());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   Future<hashset<ContainerID>> containers = containerizer.get()->containers();
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
-  ContainerID containerId = *(containers.get().begin());
+  ContainerID containerId = *(containers->begin());
   Timeout timeout = Timeout::in(Seconds(5));
 
   while (true) {
     Future<ResourceStatistics> usage = containerizer.get()->usage(containerId);
     AWAIT_READY(usage);
 
-    ASSERT_TRUE(usage.get().has_disk_limit_bytes());
-    EXPECT_EQ(Megabytes(3), Bytes(usage.get().disk_limit_bytes()));
+    ASSERT_TRUE(usage->has_disk_limit_bytes());
+    EXPECT_EQ(Megabytes(3), Bytes(usage->disk_limit_bytes()));
 
-    if (usage.get().has_disk_used_bytes()) {
+    if (usage->has_disk_used_bytes()) {
       // Usage must always be <= the limit.
-      EXPECT_LE(usage.get().disk_used_bytes(), usage.get().disk_limit_bytes());
+      EXPECT_LE(usage->disk_used_bytes(), usage->disk_limit_bytes());
 
       // Usage might not be equal to the limit, but it must hit
       // and not exceed the limit.
-      if (usage.get().disk_used_bytes() >= usage.get().disk_limit_bytes()) {
+      if (usage->disk_used_bytes() >= usage->disk_limit_bytes()) {
         EXPECT_EQ(
-            usage.get().disk_used_bytes(), usage.get().disk_limit_bytes());
-        EXPECT_EQ(Megabytes(3), Bytes(usage.get().disk_used_bytes()));
+            usage->disk_used_bytes(), usage->disk_limit_bytes());
+        EXPECT_EQ(Megabytes(3), Bytes(usage->disk_used_bytes()));
         break;
       }
     }
@@ -576,7 +576,7 @@ TEST_F(ROOT_XFS_QuotaTest, NoCheckpointRecovery)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_FALSE(offers.get().empty());
+  EXPECT_FALSE(offers->empty());
 
   Offer offer = offers.get()[0];
 
@@ -593,22 +593,22 @@ TEST_F(ROOT_XFS_QuotaTest, NoCheckpointRecovery)
   driver.launchTasks(offer.id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(task.task_id(), status.get().task_id());
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(task.task_id(), status->task_id());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   Future<ResourceUsage> usage1 =
     process::dispatch(slave.get()->pid, &Slave::usage);
   AWAIT_READY(usage1);
 
   // We should have 1 executor using resources.
-  ASSERT_EQ(1, usage1.get().executors().size());
+  ASSERT_EQ(1, usage1->executors().size());
 
   Future<hashset<ContainerID>> containers = containerizer->containers();
 
   AWAIT_READY(containers);
-  ASSERT_EQ(1u, containers.get().size());
+  ASSERT_EQ(1u, containers->size());
 
-  ContainerID containerId = *containers.get().begin();
+  ContainerID containerId = *containers->begin();
 
   // Restart the slave.
   slave.get()->terminate();
@@ -637,7 +637,7 @@ TEST_F(ROOT_XFS_QuotaTest, NoCheckpointRecovery)
   AWAIT_READY(usage2);
 
   // We should have no executors left because we didn't checkpoint.
-  ASSERT_EQ(0, usage2.get().executors().size());
+  ASSERT_EQ(0, usage2->executors().size());
 
   Try<std::list<string>> sandboxes = os::glob(path::join(
       slave::paths::getSandboxRootDir(mountPoint.get()),
@@ -700,7 +700,7 @@ TEST_F(ROOT_XFS_QuotaTest, CheckpointRecovery)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_FALSE(offers.get().empty());
+  EXPECT_FALSE(offers->empty());
 
   Offer offer = offers.get()[0];
 
@@ -716,15 +716,15 @@ TEST_F(ROOT_XFS_QuotaTest, CheckpointRecovery)
   driver.launchTasks(offer.id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(task.task_id(), status.get().task_id());
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(task.task_id(), status->task_id());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   Future<ResourceUsage> usage1 =
     process::dispatch(slave.get()->pid, &Slave::usage);
   AWAIT_READY(usage1);
 
   // We should have 1 executor using resources.
-  ASSERT_EQ(1, usage1.get().executors().size());
+  ASSERT_EQ(1, usage1->executors().size());
 
   // Restart the slave.
   slave.get()->terminate();
@@ -743,7 +743,7 @@ TEST_F(ROOT_XFS_QuotaTest, CheckpointRecovery)
   AWAIT_READY(usage2);
 
   // We should have still have 1 executor using resources.
-  ASSERT_EQ(1, usage1.get().executors().size());
+  ASSERT_EQ(1, usage1->executors().size());
 
   Try<std::list<string>> sandboxes = os::glob(path::join(
       slave::paths::getSandboxRootDir(mountPoint.get()),
@@ -813,7 +813,7 @@ TEST_F(ROOT_XFS_QuotaTest, RecoverOldContainers)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_FALSE(offers.get().empty());
+  EXPECT_FALSE(offers->empty());
 
   Offer offer = offers.get()[0];
 
@@ -829,8 +829,8 @@ TEST_F(ROOT_XFS_QuotaTest, RecoverOldContainers)
   driver.launchTasks(offer.id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(task.task_id(), status.get().task_id());
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(task.task_id(), status->task_id());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   {
     Future<ResourceUsage> usage =
@@ -839,8 +839,8 @@ TEST_F(ROOT_XFS_QuotaTest, RecoverOldContainers)
 
     // We should have 1 executor using resources but it doesn't have
     // disk limit enabled.
-    ASSERT_EQ(1, usage.get().executors().size());
-    const ResourceUsage_Executor& executor = usage.get().executors().Get(0);
+    ASSERT_EQ(1, usage->executors().size());
+    const ResourceUsage_Executor& executor = usage->executors().Get(0);
     ASSERT_TRUE(executor.has_statistics());
     ASSERT_FALSE(executor.statistics().has_disk_limit_bytes());
   }
@@ -865,8 +865,8 @@ TEST_F(ROOT_XFS_QuotaTest, RecoverOldContainers)
 
     // We should still have 1 executor using resources but it doesn't
     // have disk limit enabled.
-    ASSERT_EQ(1, usage.get().executors().size());
-    const ResourceUsage_Executor& executor = usage.get().executors().Get(0);
+    ASSERT_EQ(1, usage->executors().size());
+    const ResourceUsage_Executor& executor = usage->executors().Get(0);
     ASSERT_TRUE(executor.has_statistics());
     ASSERT_FALSE(executor.statistics().has_disk_limit_bytes());
   }

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/cram_md5_authentication_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cram_md5_authentication_tests.cpp b/src/tests/cram_md5_authentication_tests.cpp
index cd86071..4e05f37 100644
--- a/src/tests/cram_md5_authentication_tests.cpp
+++ b/src/tests/cram_md5_authentication_tests.cpp
@@ -110,7 +110,7 @@ TYPED_TEST(CRAMMD5AuthenticationTest, Success)
   EXPECT_SOME(authenticator.get()->initialize(credentials));
 
   Future<Option<string>> principal =
-    authenticator.get()->authenticate(message.get().from);
+    authenticator.get()->authenticate(message->from);
 
   AWAIT_TRUE(client);
   AWAIT_READY(principal);
@@ -155,7 +155,7 @@ TYPED_TEST(CRAMMD5AuthenticationTest, Failed1)
   EXPECT_SOME(authenticator.get()->initialize(credentials));
 
   Future<Option<string>> server =
-    authenticator.get()->authenticate(message.get().from);
+    authenticator.get()->authenticate(message->from);
 
   AWAIT_FALSE(client);
   AWAIT_READY(server);
@@ -200,7 +200,7 @@ TYPED_TEST(CRAMMD5AuthenticationTest, Failed2)
   EXPECT_SOME(authenticator.get()->initialize(credentials));
 
   Future<Option<string>> server =
-    authenticator.get()->authenticate(message.get().from);
+    authenticator.get()->authenticate(message->from);
 
   AWAIT_FALSE(client);
   AWAIT_READY(server);
@@ -252,7 +252,7 @@ TYPED_TEST(CRAMMD5AuthenticationTest, AuthenticatorDestructionRace)
     DROP_PROTOBUF(AuthenticationStepMessage(), _, _);
 
   Future<Option<string>> principal =
-    authenticator.get()->authenticate(message.get().from);
+    authenticator.get()->authenticate(message->from);
 
   AWAIT_READY(authenticationStepMessage);
 


[2/8] mesos git commit: Replace `.get().` in favor of the `->` operator in tests.

Posted by bm...@apache.org.
http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/reservation_endpoints_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/reservation_endpoints_tests.cpp b/src/tests/reservation_endpoints_tests.cpp
index ddf279b..6cda3a6 100644
--- a/src/tests/reservation_endpoints_tests.cpp
+++ b/src/tests/reservation_endpoints_tests.cpp
@@ -152,7 +152,7 @@ TEST_F(ReservationEndpointsTest, AvailableResources)
 
   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(
@@ -185,7 +185,7 @@ TEST_F(ReservationEndpointsTest, AvailableResources)
 
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   offer = offers.get()[0];
 
   EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -243,7 +243,7 @@ TEST_F(ReservationEndpointsTest, ReserveOfferedResources)
 
   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(
@@ -265,7 +265,7 @@ TEST_F(ReservationEndpointsTest, ReserveOfferedResources)
 
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   offer = offers.get()[0];
 
   EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -326,7 +326,7 @@ TEST_F(ReservationEndpointsTest, UnreserveOfferedResources)
 
   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(
@@ -348,7 +348,7 @@ TEST_F(ReservationEndpointsTest, UnreserveOfferedResources)
 
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   offer = offers.get()[0];
 
   EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -416,7 +416,7 @@ TEST_F(ReservationEndpointsTest, ReserveAvailableAndOfferedResources)
   // Expect to receive 'available + offered' resources.
   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(
@@ -451,7 +451,7 @@ TEST_F(ReservationEndpointsTest, ReserveAvailableAndOfferedResources)
 
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   offer = offers.get()[0];
 
   EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -470,7 +470,7 @@ TEST_F(ReservationEndpointsTest, ReserveAvailableAndOfferedResources)
   driver.killTask(taskInfo.task_id());
 
   AWAIT_READY(availableResources);
-  EXPECT_TRUE(availableResources.get().contains(
+  EXPECT_TRUE(availableResources->contains(
       allocatedResources(available, frameworkInfo.role())));
 
   // At this point, we have 'available' resources in the allocator, and
@@ -497,7 +497,7 @@ TEST_F(ReservationEndpointsTest, ReserveAvailableAndOfferedResources)
 
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   offer = offers.get()[0];
 
   EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -583,7 +583,7 @@ TEST_F(ReservationEndpointsTest, UnreserveAvailableAndOfferedResources)
   // Expect to receive 'available + offered' resources.
   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(
@@ -618,7 +618,7 @@ TEST_F(ReservationEndpointsTest, UnreserveAvailableAndOfferedResources)
 
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   offer = offers.get()[0];
 
   EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -637,7 +637,7 @@ TEST_F(ReservationEndpointsTest, UnreserveAvailableAndOfferedResources)
   driver.killTask(taskInfo.task_id());
 
   AWAIT_READY(availableResources);
-  EXPECT_TRUE(availableResources.get().contains(
+  EXPECT_TRUE(availableResources->contains(
       allocatedResources(available, frameworkInfo.role())));
 
   // At this point, we have 'available' resources in the allocator, and
@@ -664,7 +664,7 @@ TEST_F(ReservationEndpointsTest, UnreserveAvailableAndOfferedResources)
 
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   offer = offers.get()[0];
 
   EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -753,7 +753,7 @@ TEST_F(ReservationEndpointsTest, LabeledResources)
 
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   Offer offer = offers.get()[0];
 
   Resources offeredResources = Resources(offer.resources());
@@ -779,7 +779,7 @@ TEST_F(ReservationEndpointsTest, LabeledResources)
 
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   offer = offers.get()[0];
 
   offeredResources = Resources(offer.resources());
@@ -819,7 +819,7 @@ TEST_F(ReservationEndpointsTest, LabeledResources)
 
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   offer = offers.get()[0];
 
   offeredResources = Resources(offer.resources());
@@ -1412,7 +1412,7 @@ TEST_F(ReservationEndpointsTest, NoResources)
   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, "reserve", headers, body);
@@ -1618,7 +1618,7 @@ TEST_F(ReservationEndpointsTest, DifferentPrincipalsSameRole)
 
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   Offer offer = offers.get()[0];
   Resources resources = Resources(offer.resources());
 
@@ -1693,9 +1693,9 @@ TEST_F(ReservationEndpointsTest, AgentStateEndpointResources)
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-    << response.get().body;
+    << response->body;
 
-  Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
+  Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
   ASSERT_SOME(parse);
 
   JSON::Object state = parse.get();

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/reservation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/reservation_tests.cpp b/src/tests/reservation_tests.cpp
index 95cc911..4504831 100644
--- a/src/tests/reservation_tests.cpp
+++ b/src/tests/reservation_tests.cpp
@@ -133,7 +133,7 @@ TEST_F(ReservationTest, ReserveThenUnreserve)
   // In the first offer, expect an offer with unreserved resources.
   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(
@@ -149,7 +149,7 @@ TEST_F(ReservationTest, ReserveThenUnreserve)
   // In the next offer, 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(
@@ -165,7 +165,7 @@ TEST_F(ReservationTest, ReserveThenUnreserve)
   // In the next offer, expect an offer with 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(
@@ -226,7 +226,7 @@ TEST_F(ReservationTest, ReserveTwiceWithDoubleValue)
 
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   Offer offer = offers.get()[0];
 
   // In the first offer, expect an offer with unreserved resources.
@@ -242,7 +242,7 @@ TEST_F(ReservationTest, ReserveTwiceWithDoubleValue)
 
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   offer = offers.get()[0];
 
   // In the second offer, expect an offer with reserved resources.
@@ -262,7 +262,7 @@ TEST_F(ReservationTest, ReserveTwiceWithDoubleValue)
   // potentially crashing the agent. See MESOS-3552.
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   offer = offers.get()[0];
 
   Resources reserved = Resources::parse("cpus:0.2;mem:512").get();
@@ -334,7 +334,7 @@ TEST_F(ReservationTest, ReserveAndLaunchThenUnreserve)
   // In the first offer, expect an offer with unreserved resources.
   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(
@@ -365,7 +365,7 @@ TEST_F(ReservationTest, ReserveAndLaunchThenUnreserve)
   // In the next offer, 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(
@@ -386,7 +386,7 @@ TEST_F(ReservationTest, ReserveAndLaunchThenUnreserve)
   // In the next offer, expect an offer with 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(
@@ -458,7 +458,7 @@ TEST_F(ReservationTest, ReserveShareWithinRole)
   // In the first offer, expect an offer with unreserved resources.
   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(
@@ -479,7 +479,7 @@ TEST_F(ReservationTest, ReserveShareWithinRole)
   // In the next offer, 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(
@@ -505,7 +505,7 @@ TEST_F(ReservationTest, ReserveShareWithinRole)
   // framework1.
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   offer = offers.get()[0];
 
   EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -573,7 +573,7 @@ TEST_F(ReservationTest, DropReserveTooLarge)
   // In the first offer, expect an offer with unreserved resources.
   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(
@@ -602,7 +602,7 @@ TEST_F(ReservationTest, DropReserveTooLarge)
   // 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(
@@ -667,7 +667,7 @@ TEST_F(ReservationTest, DropReserveStaticReservation)
   // resources.
   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(
@@ -693,7 +693,7 @@ TEST_F(ReservationTest, DropReserveStaticReservation)
   // 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(
@@ -757,7 +757,7 @@ TEST_F(ReservationTest, SendingCheckpointResourcesMessage)
   // 'unreserved2'.
   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(
@@ -789,18 +789,18 @@ TEST_F(ReservationTest, SendingCheckpointResourcesMessage)
   // Expect the 'RESERVE(reserved1)' as the first message.
   // The checkpointed resources should correspond to 'reserved1'.
   AWAIT_READY(message1);
-  EXPECT_EQ(Resources(message1.get().resources()), reserved1);
+  EXPECT_EQ(Resources(message1->resources()), reserved1);
 
   // Expect the 'RESERVE(reserved2)' as the second message.
   // The checkpointed resources should correspond to
   // 'reserved1 + reserved2'.
   AWAIT_READY(message2);
-  EXPECT_EQ(Resources(message2.get().resources()), reserved1 + reserved2);
+  EXPECT_EQ(Resources(message2->resources()), reserved1 + reserved2);
 
   // Expect the 'UNRESERVE(reserved1)' as the third message.
   // The checkpointed resources should correspond to 'reserved2'.
   AWAIT_READY(message3);
-  EXPECT_EQ(Resources(message3.get().resources()), reserved2);
+  EXPECT_EQ(Resources(message3->resources()), reserved2);
 
   driver.stop();
   driver.join();
@@ -854,7 +854,7 @@ TEST_F(ReservationTest, ResourcesCheckpointing)
   // Expect an offer with the unreserved resources.
   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(
@@ -892,7 +892,7 @@ TEST_F(ReservationTest, ResourcesCheckpointing)
   // reserved resources.
   AWAIT_READY(reregisterSlave);
 
-  EXPECT_EQ(reregisterSlave.get().checkpointed_resources(), reserved);
+  EXPECT_EQ(reregisterSlave->checkpointed_resources(), reserved);
 
   driver.stop();
   driver.join();
@@ -945,7 +945,7 @@ TEST_F(ReservationTest, MasterFailover)
   // In the first offer, expect an offer with unreserved resources.
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   Offer offer = offers.get()[0];
 
   Future<CheckpointResourcesMessage> checkpointResources =
@@ -1001,7 +1001,7 @@ TEST_F(ReservationTest, MasterFailover)
   // In the next offer, expect an offer with the 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(
@@ -1071,7 +1071,7 @@ TEST_F(ReservationTest, CompatibleCheckpointedResources)
   // In the first offer, expect an offer with unreserved resources.
   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(
@@ -1191,7 +1191,7 @@ TEST_F(ReservationTest, CompatibleCheckpointedResourcesWithPersistentVolumes)
 
   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(
@@ -1221,15 +1221,15 @@ TEST_F(ReservationTest, CompatibleCheckpointedResourcesWithPersistentVolumes)
   // 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()), reserved + reservedDisk);
+  EXPECT_EQ(Resources(message1->resources()), reserved + reservedDisk);
 
   AWAIT_READY(message2);
-  EXPECT_EQ(Resources(message2.get().resources()), reserved + volume);
+  EXPECT_EQ(Resources(message2->resources()), reserved + volume);
 
   // Expect an offer containing the 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(
@@ -1329,7 +1329,7 @@ TEST_F(ReservationTest, IncompatibleCheckpointedResources)
   // In the first offer, expect an offer with unreserved resources.
   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(
@@ -1453,7 +1453,7 @@ TEST_F(ReservationTest, GoodACLReserveThenUnreserve)
   // In the first offer, expect an offer with unreserved resources.
   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(
@@ -1469,7 +1469,7 @@ TEST_F(ReservationTest, GoodACLReserveThenUnreserve)
   // In the next offer, 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(
@@ -1485,7 +1485,7 @@ TEST_F(ReservationTest, GoodACLReserveThenUnreserve)
   // In the next offer, expect an offer with 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(
@@ -1556,7 +1556,7 @@ TEST_F(ReservationTest, BadACLDropReserve)
   // In the first offer, expect an offer with unreserved resources.
   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(
@@ -1573,7 +1573,7 @@ TEST_F(ReservationTest, BadACLDropReserve)
   // 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(
@@ -1655,7 +1655,7 @@ TEST_F(ReservationTest, BadACLDropUnreserve)
   // In the first offer, expect an offer with unreserved resources.
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   Offer offer = offers.get()[0];
 
   // The slave's total resources are twice those defined by `unreserved1`.
@@ -1672,7 +1672,7 @@ TEST_F(ReservationTest, BadACLDropUnreserve)
   // In the next offer, expect an offer with reserved resources.
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   offer = offers.get()[0];
 
   // The reserved resources and an equal portion of
@@ -1696,7 +1696,7 @@ TEST_F(ReservationTest, BadACLDropUnreserve)
   // resources, since the Unreserve operation should fail.
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   offer = offers.get()[0];
 
   EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -1795,7 +1795,7 @@ TEST_F(ReservationTest, ACLMultipleOperations)
   Clock::advance(masterFlags.allocation_interval);
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   Offer offer = offers.get()[0];
 
   // The slave's total resources are twice those defined by `unreserved1`.
@@ -1815,7 +1815,7 @@ TEST_F(ReservationTest, ACLMultipleOperations)
   // In the next offer, expect an offer with reserved resources.
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   offer = offers.get()[0];
 
   // The reserved resources and an equal portion of
@@ -1853,7 +1853,7 @@ TEST_F(ReservationTest, ACLMultipleOperations)
 
   // Wait for TASK_FINISHED update ack.
   AWAIT_READY(statusUpdateAcknowledgement);
-  EXPECT_EQ(TASK_FINISHED, statusUpdateAcknowledgement.get().state());
+  EXPECT_EQ(TASK_FINISHED, statusUpdateAcknowledgement->state());
 
   Clock::settle();
   Clock::advance(masterFlags.allocation_interval);
@@ -1862,7 +1862,7 @@ TEST_F(ReservationTest, ACLMultipleOperations)
   // resources, since the Unreserve operation should fail.
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   offer = offers.get()[0];
 
   EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -1899,7 +1899,7 @@ TEST_F(ReservationTest, ACLMultipleOperations)
   // In the next offer, expect to find the 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(
@@ -1908,7 +1908,7 @@ TEST_F(ReservationTest, ACLMultipleOperations)
           frameworkInfo.role())));
 
   // Check that the task launched as expected.
-  EXPECT_EQ(TASK_FINISHED, failedTaskStatus.get().state());
+  EXPECT_EQ(TASK_FINISHED, failedTaskStatus->state());
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -1976,7 +1976,7 @@ TEST_F(ReservationTest, WithoutAuthenticationWithoutPrincipal)
   Clock::advance(masterFlags.allocation_interval);
   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(
@@ -1994,7 +1994,7 @@ TEST_F(ReservationTest, WithoutAuthenticationWithoutPrincipal)
 
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   offer = offers.get()[0];
 
   // Make sure that the reservation succeeded.
@@ -2015,7 +2015,7 @@ TEST_F(ReservationTest, WithoutAuthenticationWithoutPrincipal)
   // In the next offer, expect an offer with 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(
@@ -2084,7 +2084,7 @@ TEST_F(ReservationTest, WithoutAuthenticationWithPrincipal)
   Clock::advance(masterFlags.allocation_interval);
   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(
@@ -2102,7 +2102,7 @@ TEST_F(ReservationTest, WithoutAuthenticationWithPrincipal)
 
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   offer = offers.get()[0];
 
   // Make sure that the reservation succeeded.
@@ -2123,7 +2123,7 @@ TEST_F(ReservationTest, WithoutAuthenticationWithPrincipal)
   // In the next offer, expect an offer with 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(
@@ -2182,7 +2182,7 @@ TEST_F(ReservationTest, DropReserveWithInvalidRole)
   // In the first offer, expect an offer with unreserved resources.
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   Offer offer = offers->front();
 
   Resources unreserved = Resources::parse("cpus:1;mem:512").get();
@@ -2217,7 +2217,7 @@ TEST_F(ReservationTest, DropReserveWithInvalidRole)
   // In the next offer, still expect an offer with the unreserved resources.
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   offer = offers->front();
 
   EXPECT_TRUE(Resources(offer.resources()).contains(
@@ -2337,7 +2337,7 @@ TEST_F(ReservationTest, PreventUnreservingAlienResources)
   // Expect an offer without the resources reserved by `framework1`.
   AWAIT_READY(offers);
 
-  ASSERT_EQ(1u, offers.get().size());
+  ASSERT_EQ(1u, offers->size());
   offer = offers->front();
 
   EXPECT_TRUE(Resources(offer.resources()).contains(

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/resource_offers_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/resource_offers_tests.cpp b/src/tests/resource_offers_tests.cpp
index 02fb248..f0bca1d 100644
--- a/src/tests/resource_offers_tests.cpp
+++ b/src/tests/resource_offers_tests.cpp
@@ -94,12 +94,12 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
-  EXPECT_GE(10u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
+  EXPECT_GE(10u, offers->size());
 
   Resources resources(offers.get()[0].resources());
-  EXPECT_EQ(2, resources.get<Value::Scalar>("cpus").get().value());
-  EXPECT_EQ(1024, resources.get<Value::Scalar>("mem").get().value());
+  EXPECT_EQ(2, resources.get<Value::Scalar>("cpus")->value());
+  EXPECT_EQ(1024, resources.get<Value::Scalar>("mem")->value());
 
   driver.stop();
   driver.join();
@@ -128,7 +128,7 @@ TEST_F(ResourceOffersTest, ResourcesGetReofferedAfterFrameworkStops)
   driver1.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   driver1.stop();
   driver1.join();
@@ -173,7 +173,7 @@ TEST_F(ResourceOffersTest, ResourcesGetReofferedWhenUnused)
   driver1.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   vector<TaskInfo> tasks; // Use nothing!
   driver1.launchTasks(offers.get()[0].id(), tasks);
@@ -223,7 +223,7 @@ TEST_F(ResourceOffersTest, ResourcesGetReofferedAfterTaskInfoError)
   driver1.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("");
@@ -251,12 +251,12 @@ TEST_F(ResourceOffersTest, ResourcesGetReofferedAfterTaskInfoError)
   driver1.launchTasks(offers.get()[0].id(), tasks);
 
   AWAIT_READY(status);
-  EXPECT_EQ(task.task_id(), status.get().task_id());
-  EXPECT_EQ(TASK_ERROR, status.get().state());
-  EXPECT_EQ(TaskStatus::REASON_TASK_INVALID, status.get().reason());
-  EXPECT_TRUE(status.get().has_message());
+  EXPECT_EQ(task.task_id(), status->task_id());
+  EXPECT_EQ(TASK_ERROR, status->state());
+  EXPECT_EQ(TaskStatus::REASON_TASK_INVALID, status->reason());
+  EXPECT_TRUE(status->has_message());
   EXPECT_TRUE(strings::startsWith(
-        status.get().message(), "Task uses invalid resources"))
+        status->message(), "Task uses invalid resources"))
     << status->message();
 
   MockScheduler sched2;
@@ -316,8 +316,8 @@ TEST_F(ResourceOffersTest, Request)
   driver.requestResources(sent);
 
   AWAIT_READY(received);
-  EXPECT_EQ(sent.size(), received.get().size());
-  EXPECT_NE(0u, received.get().size());
+  EXPECT_EQ(sent.size(), received->size());
+  EXPECT_NE(0u, received->size());
   EXPECT_EQ(request.slave_id(), received.get()[0].slave_id());
 
   driver.stop();

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/resources_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/resources_tests.cpp b/src/tests/resources_tests.cpp
index 2bdce3c..5ffc9e7 100644
--- a/src/tests/resources_tests.cpp
+++ b/src/tests/resources_tests.cpp
@@ -1046,16 +1046,16 @@ TEST(ResourcesTest, ScalarAddition)
 
   EXPECT_FALSE(sum.empty());
   EXPECT_EQ(2u, sum.size());
-  EXPECT_EQ(3, sum.get<Value::Scalar>("cpus").get().value());
-  EXPECT_EQ(15, sum.get<Value::Scalar>("mem").get().value());
+  EXPECT_EQ(3, sum.get<Value::Scalar>("cpus")->value());
+  EXPECT_EQ(15, sum.get<Value::Scalar>("mem")->value());
 
   Resources r = r1;
   r += r2;
 
   EXPECT_FALSE(r.empty());
   EXPECT_EQ(2u, r.size());
-  EXPECT_EQ(3, r.get<Value::Scalar>("cpus").get().value());
-  EXPECT_EQ(15, r.get<Value::Scalar>("mem").get().value());
+  EXPECT_EQ(3, r.get<Value::Scalar>("cpus")->value());
+  EXPECT_EQ(15, r.get<Value::Scalar>("mem")->value());
 }
 
 
@@ -1100,14 +1100,14 @@ TEST(ResourcesTest, ScalarSubtraction)
   Resources diff = r1 - r2;
 
   EXPECT_FALSE(diff.empty());
-  EXPECT_EQ(49.5, diff.get<Value::Scalar>("cpus").get().value());
-  EXPECT_EQ(3072, diff.get<Value::Scalar>("mem").get().value());
+  EXPECT_EQ(49.5, diff.get<Value::Scalar>("cpus")->value());
+  EXPECT_EQ(3072, diff.get<Value::Scalar>("mem")->value());
 
   Resources r = r1;
   r -= r2;
 
-  EXPECT_EQ(49.5, diff.get<Value::Scalar>("cpus").get().value());
-  EXPECT_EQ(3072, diff.get<Value::Scalar>("mem").get().value());
+  EXPECT_EQ(49.5, diff.get<Value::Scalar>("cpus")->value());
+  EXPECT_EQ(3072, diff.get<Value::Scalar>("mem")->value());
 
   r = r1;
   r -= r1;
@@ -1213,7 +1213,7 @@ TEST(ResourcesTest, RangesAddition)
   EXPECT_FALSE(r.empty());
 
   EXPECT_SOME_EQ(
-      values::parse("[10000-50000]").get().ranges(),
+      values::parse("[10000-50000]")->ranges(),
       r.get<Value::Ranges>("ports"));
 }
 
@@ -1230,7 +1230,7 @@ TEST(ResourcesTest, RangesAddition2)
   EXPECT_FALSE(r.empty());
 
   EXPECT_SOME_EQ(
-      values::parse("[1-65, 70-80]").get().ranges(),
+      values::parse("[1-65, 70-80]")->ranges(),
       r.get<Value::Ranges>("ports"));
 }
 
@@ -1249,7 +1249,7 @@ TEST(ResourcesTest, RangesAddition3)
   EXPECT_FALSE(r1.empty());
 
   EXPECT_SOME_EQ(
-      values::parse("[1-4]").get().ranges(),
+      values::parse("[1-4]")->ranges(),
       r1.get<Value::Ranges>("ports"));
 
   Resources r2;
@@ -1259,7 +1259,7 @@ TEST(ResourcesTest, RangesAddition3)
   EXPECT_FALSE(r2.empty());
 
   EXPECT_SOME_EQ(
-      values::parse("[5-8]").get().ranges(),
+      values::parse("[5-8]")->ranges(),
       r2.get<Value::Ranges>("ports"));
 
   r2 += r1;
@@ -1267,7 +1267,7 @@ TEST(ResourcesTest, RangesAddition3)
   EXPECT_FALSE(r2.empty());
 
   EXPECT_SOME_EQ(
-      values::parse("[1-8]").get().ranges(),
+      values::parse("[1-8]")->ranges(),
       r2.get<Value::Ranges>("ports"));
 }
 
@@ -1287,7 +1287,7 @@ TEST(ResourcesTest, RangesAddition4)
   EXPECT_FALSE(r.empty());
 
   EXPECT_SOME_EQ(
-      values::parse("[1-10, 20-30]").get().ranges(),
+      values::parse("[1-10, 20-30]")->ranges(),
       r.get<Value::Ranges>("ports"));
 }
 
@@ -1307,7 +1307,7 @@ TEST(ResourcesTest, RangesSubtraction)
   EXPECT_FALSE(r.empty());
 
   EXPECT_SOME_EQ(
-      values::parse("[20001-29999]").get().ranges(),
+      values::parse("[20001-29999]")->ranges(),
       r.get<Value::Ranges>("ports"));
 }
 
@@ -1324,7 +1324,7 @@ TEST(ResourcesTest, RangesSubtraction1)
   EXPECT_FALSE(r.empty());
 
   EXPECT_SOME_EQ(
-      values::parse("[50002-60000]").get().ranges(),
+      values::parse("[50002-60000]")->ranges(),
       r.get<Value::Ranges>("ports"));
 }
 
@@ -1341,7 +1341,7 @@ TEST(ResourcesTest, RangesSubtraction2)
   EXPECT_FALSE(r.empty());
 
   EXPECT_SOME_EQ(
-      values::parse("[50001-60000]").get().ranges(),
+      values::parse("[50001-60000]")->ranges(),
       r.get<Value::Ranges>("ports"));
 }
 
@@ -1358,7 +1358,7 @@ TEST(ResourcesTest, RangesSubtraction3)
   EXPECT_FALSE(resourcesFree.empty());
 
   EXPECT_SOME_EQ(
-      values::parse("[50002-60000]").get().ranges(),
+      values::parse("[50002-60000]")->ranges(),
       resourcesFree.get<Value::Ranges>("ports"));
 }
 
@@ -1391,7 +1391,7 @@ TEST(ResourcesTest, RangesSubtraction5)
   EXPECT_FALSE(r.empty());
 
   EXPECT_SOME_EQ(
-      values::parse("[1-1, 10-10, 46-47]").get().ranges(),
+      values::parse("[1-1, 10-10, 46-47]")->ranges(),
       r.get<Value::Ranges>("ports"));
 }
 
@@ -1408,7 +1408,7 @@ TEST(ResourcesTest, RangesSubtraction6)
   EXPECT_FALSE(r.empty());
 
   EXPECT_SOME_EQ(
-      values::parse("[1-10]").get().ranges(),
+      values::parse("[1-10]")->ranges(),
       r.get<Value::Ranges>("ports"));
 }
 
@@ -1465,7 +1465,7 @@ TEST(ResourcesTest, SetAddition)
   Option<Value::Set> set = r.get<Value::Set>("disks");
 
   ASSERT_SOME(set);
-  EXPECT_EQ(4, set.get().item_size());
+  EXPECT_EQ(4, set->item_size());
 }
 
 
@@ -1486,8 +1486,8 @@ TEST(ResourcesTest, SetSubtraction)
   Option<Value::Set> set = r.get<Value::Set>("disks");
 
   ASSERT_SOME(set);
-  EXPECT_EQ(1, set.get().item_size());
-  EXPECT_EQ("sda1", set.get().item(0));
+  EXPECT_EQ(1, set->item_size());
+  EXPECT_EQ("sda1", set->item(0));
 }
 
 
@@ -1919,7 +1919,7 @@ TEST(DiskResourcesTest, Validation)
   ASSERT_SOME(error);
   EXPECT_EQ(
       "DiskInfo should not be set for cpus resource",
-      error.get().message);
+      error->message);
 
   EXPECT_NONE(
       Resources::validate(createDiskResource("10", "role", "1", "path")));
@@ -2378,7 +2378,7 @@ TEST(ResourcesOperationTest, CreateSharedPersistentVolume)
   destroy1.set_type(Offer::Operation::DESTROY);
   destroy1.mutable_destroy()->add_volumes()->CopyFrom(volume1);
 
-  EXPECT_SOME_EQ(total, total.apply(create1).get().apply(destroy1));
+  EXPECT_SOME_EQ(total, total.apply(create1)->apply(destroy1));
 
   // Check the case of insufficient disk resources.
   Resource volume2 = createDiskResource(
@@ -2686,9 +2686,9 @@ TEST(SharedResourcesTest, ScalarAdditionShared)
 
   EXPECT_FALSE(sum.empty());
   EXPECT_EQ(3u, sum.size());
-  EXPECT_EQ(3, sum.get<Value::Scalar>("cpus").get().value());
-  EXPECT_EQ(15, sum.get<Value::Scalar>("mem").get().value());
-  EXPECT_EQ(50, sum.get<Value::Scalar>("disk").get().value());
+  EXPECT_EQ(3, sum.get<Value::Scalar>("cpus")->value());
+  EXPECT_EQ(15, sum.get<Value::Scalar>("mem")->value());
+  EXPECT_EQ(50, sum.get<Value::Scalar>("disk")->value());
   EXPECT_EQ(2u, sum.count(disk));
 
   // Verify operator+= on Resources is the same as operator+.
@@ -2712,9 +2712,9 @@ TEST(SharedResourcesTest, ScalarSubtractionShared)
 
   EXPECT_FALSE(diff.empty());
   EXPECT_EQ(3u, diff.size());
-  EXPECT_EQ(35, diff.get<Value::Scalar>("cpus").get().value());
-  EXPECT_EQ(3584, diff.get<Value::Scalar>("mem").get().value());
-  EXPECT_EQ(8192, diff.get<Value::Scalar>("disk").get().value());
+  EXPECT_EQ(35, diff.get<Value::Scalar>("cpus")->value());
+  EXPECT_EQ(3584, diff.get<Value::Scalar>("mem")->value());
+  EXPECT_EQ(8192, diff.get<Value::Scalar>("disk")->value());
   EXPECT_EQ(1u, diff.count(disk));
   EXPECT_TRUE(diff.contains(disk));
 
@@ -2816,7 +2816,7 @@ TEST(SharedResourcesTest, ScalarSharedAndNonSharedOperations)
 
   EXPECT_FALSE(r3.empty());
   EXPECT_EQ(2u, r3.size());
-  EXPECT_EQ(200, r3.get<Value::Scalar>("disk").get().value());
+  EXPECT_EQ(200, r3.get<Value::Scalar>("disk")->value());
   EXPECT_EQ(2u, r3.count(sharedDisk));
   EXPECT_EQ(1u, r3.count(nonSharedDisk));
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/role_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/role_tests.cpp b/src/tests/role_tests.cpp
index 77f3d46..1d58d7b 100644
--- a/src/tests/role_tests.cpp
+++ b/src/tests/role_tests.cpp
@@ -136,7 +136,7 @@ TEST_F(RoleTest, ImplicitRoleRegister)
   // In the first offer, expect an offer with unreserved resources.
   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(
@@ -154,7 +154,7 @@ TEST_F(RoleTest, ImplicitRoleRegister)
   // In the next offer, 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(
@@ -180,7 +180,7 @@ TEST_F(RoleTest, ImplicitRoleRegister)
   // In the next offer, 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(
@@ -245,7 +245,7 @@ TEST_F(RoleTest, ImplicitRoleStaticReservation)
 
   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(
@@ -288,11 +288,11 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RoleTest, EndpointEmpty)
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-    << response.get().body;
+    << response->body;
 
   AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response);
 
-  Try<JSON::Value> parse = JSON::parse(response.get().body);
+  Try<JSON::Value> parse = JSON::parse(response->body);
   ASSERT_SOME(parse);
 
   Try<JSON::Value> expected = JSON::parse(
@@ -324,11 +324,11 @@ TEST_F(RoleTest, EndpointNoFrameworks)
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-    << response.get().body;
+    << response->body;
 
   AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response);
 
-  Try<JSON::Value> parse = JSON::parse(response.get().body);
+  Try<JSON::Value> parse = JSON::parse(response->body);
   ASSERT_SOME(parse);
 
   Try<JSON::Value> expected = JSON::parse(
@@ -422,18 +422,18 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RoleTest, EndpointImplicitRolesWeights)
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-    << response.get().body;
+    << response->body;
 
   AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response);
 
-  Try<JSON::Value> parse = JSON::parse(response.get().body);
+  Try<JSON::Value> parse = JSON::parse(response->body);
   ASSERT_SOME(parse);
 
   Try<JSON::Value> expected = JSON::parse(
       "{"
       "  \"roles\": ["
       "    {"
-      "      \"frameworks\": [\"" + frameworkId1.get().value() + "\"],"
+      "      \"frameworks\": [\"" + frameworkId1->value() + "\"],"
       "      \"name\": \"roleX\","
       "      \"resources\": {"
       "        \"cpus\": 0,"
@@ -455,7 +455,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RoleTest, EndpointImplicitRolesWeights)
       "      \"weight\": 4.0"
       "    },"
       "    {"
-      "      \"frameworks\": [\"" + frameworkId2.get().value() + "\"],"
+      "      \"frameworks\": [\"" + frameworkId2->value() + "\"],"
       "      \"name\": \"roleZ\","
       "      \"resources\": {"
       "        \"cpus\": 0,"
@@ -506,7 +506,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RoleTest, EndpointImplicitRolesQuotas)
       quotaRequestBody);
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, quotaResponse)
-    << quotaResponse.get().body;
+    << quotaResponse->body;
 
   Future<Response> rolesResponse = process::http::get(
       master.get()->pid,
@@ -515,12 +515,12 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RoleTest, EndpointImplicitRolesQuotas)
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, rolesResponse)
-    << rolesResponse.get().body;
+    << rolesResponse->body;
 
   AWAIT_EXPECT_RESPONSE_HEADER_EQ(
       APPLICATION_JSON, "Content-Type", rolesResponse);
 
-  Try<JSON::Value> parse = JSON::parse(rolesResponse.get().body);
+  Try<JSON::Value> parse = JSON::parse(rolesResponse->body);
   ASSERT_SOME(parse);
 
   Try<JSON::Value> expected = JSON::parse(
@@ -551,7 +551,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RoleTest, EndpointImplicitRolesQuotas)
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, deleteResponse)
-    << deleteResponse.get().body;
+    << deleteResponse->body;
 
   rolesResponse = process::http::get(
       master.get()->pid,
@@ -560,12 +560,12 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RoleTest, EndpointImplicitRolesQuotas)
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, rolesResponse)
-    << rolesResponse.get().body;
+    << rolesResponse->body;
 
   AWAIT_EXPECT_RESPONSE_HEADER_EQ(
       APPLICATION_JSON, "Content-Type", rolesResponse);
 
-  parse = JSON::parse(rolesResponse.get().body);
+  parse = JSON::parse(rolesResponse->body);
   ASSERT_SOME(parse);
 
   expected = JSON::parse(
@@ -679,9 +679,9 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
         createBasicAuthHeaders(DEFAULT_CREDENTIAL));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-      << response.get().body;
+      << response->body;
 
-    Try<JSON::Value> parse = JSON::parse(response.get().body);
+    Try<JSON::Value> parse = JSON::parse(response->body);
     ASSERT_SOME(parse);
 
     Try<JSON::Value> expected = JSON::parse(

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/scheduler_driver_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/scheduler_driver_tests.cpp b/src/tests/scheduler_driver_tests.cpp
index 3705d13..139909f 100644
--- a/src/tests/scheduler_driver_tests.cpp
+++ b/src/tests/scheduler_driver_tests.cpp
@@ -99,7 +99,7 @@ TEST_F(MesosSchedulerDriverTest, MetricsEndpoint)
   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);
 
@@ -296,7 +296,7 @@ TEST_F(MesosSchedulerDriverTest, ExplicitAcknowledgementsMasterGeneratedUpdate)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Launch a task using no resources.
   TaskInfo task;
@@ -315,9 +315,9 @@ TEST_F(MesosSchedulerDriverTest, ExplicitAcknowledgementsMasterGeneratedUpdate)
   driver.launchTasks(offers.get()[0].id(), tasks);
 
   AWAIT_READY(status);
-  ASSERT_EQ(TASK_ERROR, status.get().state());
-  ASSERT_EQ(TaskStatus::SOURCE_MASTER, status.get().source());
-  ASSERT_EQ(TaskStatus::REASON_TASK_INVALID, status.get().reason());
+  ASSERT_EQ(TASK_ERROR, status->state());
+  ASSERT_EQ(TaskStatus::SOURCE_MASTER, status->source());
+  ASSERT_EQ(TaskStatus::REASON_TASK_INVALID, status->reason());
 
   // Now send the acknowledgement.
   driver.acknowledgeStatusUpdate(status.get());
@@ -380,10 +380,10 @@ TEST_F(MesosSchedulerDriverTest, ExplicitAcknowledgementsUnsetSlaveID)
   driver.reconcileTasks(statuses);
 
   AWAIT_READY(update);
-  ASSERT_EQ(TASK_LOST, update.get().state());
-  ASSERT_EQ(TaskStatus::SOURCE_MASTER, update.get().source());
-  ASSERT_EQ(TaskStatus::REASON_RECONCILIATION, update.get().reason());
-  ASSERT_FALSE(update.get().has_slave_id());
+  ASSERT_EQ(TASK_LOST, update->state());
+  ASSERT_EQ(TaskStatus::SOURCE_MASTER, update->source());
+  ASSERT_EQ(TaskStatus::REASON_RECONCILIATION, update->reason());
+  ASSERT_FALSE(update->has_slave_id());
 
   // Now send the acknowledgement.
   driver.acknowledgeStatusUpdate(update.get());

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/scheduler_event_call_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/scheduler_event_call_tests.cpp b/src/tests/scheduler_event_call_tests.cpp
index 8ea5eb8..48649f2 100644
--- a/src/tests/scheduler_event_call_tests.cpp
+++ b/src/tests/scheduler_event_call_tests.cpp
@@ -98,10 +98,10 @@ TEST_F(SchedulerDriverEventTest, Subscribed)
   driver.start();
 
   AWAIT_READY(frameworkRegisteredMessage);
-  UPID frameworkPid = frameworkRegisteredMessage.get().to;
+  UPID frameworkPid = frameworkRegisteredMessage->to;
 
   FrameworkRegisteredMessage message;
-  ASSERT_TRUE(message.ParseFromString(frameworkRegisteredMessage.get().body));
+  ASSERT_TRUE(message.ParseFromString(frameworkRegisteredMessage->body));
 
   FrameworkID frameworkId = message.framework_id();
   frameworkInfo.mutable_id()->CopyFrom(frameworkId);
@@ -149,10 +149,10 @@ TEST_F(SchedulerDriverEventTest, SubscribedDisconnection)
   driver.start();
 
   AWAIT_READY(frameworkRegisteredMessage);
-  UPID frameworkPid = frameworkRegisteredMessage.get().to;
+  UPID frameworkPid = frameworkRegisteredMessage->to;
 
   FrameworkRegisteredMessage message;
-  ASSERT_TRUE(message.ParseFromString(frameworkRegisteredMessage.get().body));
+  ASSERT_TRUE(message.ParseFromString(frameworkRegisteredMessage->body));
 
   FrameworkID frameworkId = message.framework_id();
   frameworkInfo.mutable_id()->CopyFrom(frameworkId);
@@ -218,10 +218,10 @@ TEST_F(SchedulerDriverEventTest, SubscribedMasterFailover)
   driver.start();
 
   AWAIT_READY(frameworkRegisteredMessage);
-  UPID frameworkPid = frameworkRegisteredMessage.get().to;
+  UPID frameworkPid = frameworkRegisteredMessage->to;
 
   FrameworkRegisteredMessage message;
-  ASSERT_TRUE(message.ParseFromString(frameworkRegisteredMessage.get().body));
+  ASSERT_TRUE(message.ParseFromString(frameworkRegisteredMessage->body));
 
   FrameworkID frameworkId = message.framework_id();
   frameworkInfo.mutable_id()->CopyFrom(frameworkId);
@@ -293,10 +293,10 @@ TEST_F(SchedulerDriverEventTest, SubscribedSchedulerFailover)
   driver.start();
 
   AWAIT_READY(frameworkRegisteredMessage);
-  UPID frameworkPid = frameworkRegisteredMessage.get().to;
+  UPID frameworkPid = frameworkRegisteredMessage->to;
 
   FrameworkRegisteredMessage message;
-  ASSERT_TRUE(message.ParseFromString(frameworkRegisteredMessage.get().body));
+  ASSERT_TRUE(message.ParseFromString(frameworkRegisteredMessage->body));
 
   FrameworkID frameworkId = message.framework_id();
   frameworkInfo.mutable_id()->CopyFrom(frameworkId);
@@ -326,7 +326,7 @@ TEST_F(SchedulerDriverEventTest, SubscribedSchedulerFailover)
   driver2.start();
 
   AWAIT_READY(frameworkRegisteredMessage);
-  UPID frameworkPid2 = frameworkRegisteredMessage.get().to;
+  UPID frameworkPid2 = frameworkRegisteredMessage->to;
 
   Future<Nothing> registered2;
   EXPECT_CALL(sched2, registered(&driver2, frameworkId, _))
@@ -361,7 +361,7 @@ TEST_F(SchedulerDriverEventTest, Offers)
   schedDriver.start();
 
   AWAIT_READY(frameworkRegisteredMessage);
-  UPID frameworkPid = frameworkRegisteredMessage.get().to;
+  UPID frameworkPid = frameworkRegisteredMessage->to;
 
   // Start a slave and capture the offers.
   Future<ResourceOffersMessage> resourceOffersMessage =
@@ -378,7 +378,7 @@ TEST_F(SchedulerDriverEventTest, Offers)
   AWAIT_READY(resourceOffersMessage);
 
   google::protobuf::RepeatedPtrField<Offer> offers =
-    resourceOffersMessage.get().offers();
+    resourceOffersMessage->offers();
 
   ASSERT_EQ(1, offers.size());
 
@@ -415,7 +415,7 @@ TEST_F(SchedulerDriverEventTest, Offers)
   schedDriver.launchTasks(offers.Get(0).id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   // This message should skip the master!
   Future<FrameworkToExecutorMessage> frameworkToExecutorMessage =
@@ -460,7 +460,7 @@ TEST_F(SchedulerDriverEventTest, Rescind)
   driver.start();
 
   AWAIT_READY(frameworkRegisteredMessage);
-  UPID frameworkPid = frameworkRegisteredMessage.get().to;
+  UPID frameworkPid = frameworkRegisteredMessage->to;
 
   Event event;
   event.set_type(Event::RESCIND);
@@ -497,10 +497,10 @@ TEST_F(SchedulerDriverEventTest, Update)
   driver.start();
 
   AWAIT_READY(frameworkRegisteredMessage);
-  UPID frameworkPid = frameworkRegisteredMessage.get().to;
+  UPID frameworkPid = frameworkRegisteredMessage->to;
 
   FrameworkRegisteredMessage message;
-  ASSERT_TRUE(message.ParseFromString(frameworkRegisteredMessage.get().body));
+  ASSERT_TRUE(message.ParseFromString(frameworkRegisteredMessage->body));
 
   FrameworkID frameworkId = message.framework_id();
 
@@ -572,7 +572,7 @@ TEST_F(SchedulerDriverEventTest, Message)
   driver.start();
 
   AWAIT_READY(frameworkRegisteredMessage);
-  UPID frameworkPid = frameworkRegisteredMessage.get().to;
+  UPID frameworkPid = frameworkRegisteredMessage->to;
 
   Event event;
   event.set_type(Event::MESSAGE);
@@ -615,7 +615,7 @@ TEST_F(SchedulerDriverEventTest, Failure)
   driver.start();
 
   AWAIT_READY(frameworkRegisteredMessage);
-  UPID frameworkPid = frameworkRegisteredMessage.get().to;
+  UPID frameworkPid = frameworkRegisteredMessage->to;
 
   // Send a failure for an executor, which should trigger executorLost callback.
   SlaveID slaveId;
@@ -673,7 +673,7 @@ TEST_F(SchedulerDriverEventTest, Error)
   driver.start();
 
   AWAIT_READY(frameworkRegisteredMessage);
-  UPID frameworkPid = frameworkRegisteredMessage.get().to;
+  UPID frameworkPid = frameworkRegisteredMessage->to;
 
   Event event;
   event.set_type(Event::ERROR);

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/scheduler_http_api_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/scheduler_http_api_tests.cpp b/src/tests/scheduler_http_api_tests.cpp
index 083cc3e..cc03be0 100644
--- a/src/tests/scheduler_http_api_tests.cpp
+++ b/src/tests/scheduler_http_api_tests.cpp
@@ -272,11 +272,11 @@ TEST_P(SchedulerHttpApiTest, Subscribe)
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
   AWAIT_EXPECT_RESPONSE_HEADER_EQ("chunked", "Transfer-Encoding", response);
-  ASSERT_EQ(Response::PIPE, response.get().type);
-  ASSERT_TRUE(response.get().headers.contains("Mesos-Stream-Id"));
-  EXPECT_NE("", response.get().headers.at("Mesos-Stream-Id"));
+  ASSERT_EQ(Response::PIPE, response->type);
+  ASSERT_TRUE(response->headers.contains("Mesos-Stream-Id"));
+  EXPECT_NE("", response->headers.at("Mesos-Stream-Id"));
 
-  Option<Pipe::Reader> reader = response.get().reader;
+  Option<Pipe::Reader> reader = response->reader;
   ASSERT_SOME(reader);
 
   auto deserializer = lambda::bind(
@@ -289,15 +289,15 @@ TEST_P(SchedulerHttpApiTest, Subscribe)
   ASSERT_SOME(event.get());
 
   // Check event type is subscribed and the framework id is set.
-  ASSERT_EQ(Event::SUBSCRIBED, event.get().get().type());
-  EXPECT_NE("", event.get().get().subscribed().framework_id().value());
+  ASSERT_EQ(Event::SUBSCRIBED, event->get().type());
+  EXPECT_NE("", event->get().subscribed().framework_id().value());
 
   // Make sure it receives a heartbeat.
   event = responseDecoder.read();
   AWAIT_READY(event);
   ASSERT_SOME(event.get());
 
-  ASSERT_EQ(Event::HEARTBEAT, event.get().get().type());
+  ASSERT_EQ(Event::HEARTBEAT, event->get().type());
 
   // Advance the clock to receive another heartbeat.
   Clock::pause();
@@ -307,7 +307,7 @@ TEST_P(SchedulerHttpApiTest, Subscribe)
   AWAIT_READY(event);
   ASSERT_SOME(event.get());
 
-  ASSERT_EQ(Event::HEARTBEAT, event.get().get().type());
+  ASSERT_EQ(Event::HEARTBEAT, event->get().type());
 }
 
 
@@ -342,9 +342,9 @@ TEST_P(SchedulerHttpApiTest, RejectFrameworkWithInvalidRole)
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
   AWAIT_EXPECT_RESPONSE_HEADER_EQ("chunked", "Transfer-Encoding", response);
-  ASSERT_EQ(Response::PIPE, response.get().type);
+  ASSERT_EQ(Response::PIPE, response->type);
 
-  Option<Pipe::Reader> reader = response.get().reader;
+  Option<Pipe::Reader> reader = response->reader;
   ASSERT_SOME(reader);
 
   auto deserializer = lambda::bind(
@@ -357,7 +357,7 @@ TEST_P(SchedulerHttpApiTest, RejectFrameworkWithInvalidRole)
   ASSERT_SOME(event.get());
 
   // Check event type is error.
-  ASSERT_EQ(Event::ERROR, event.get().get().type());
+  ASSERT_EQ(Event::ERROR, event->get().type());
 }
 
 
@@ -425,9 +425,9 @@ TEST_P(SchedulerHttpApiTest, SubscribedOnRetry)
         contentType);
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
-    ASSERT_EQ(Response::PIPE, response.get().type);
+    ASSERT_EQ(Response::PIPE, response->type);
 
-    Option<Pipe::Reader> reader = response.get().reader;
+    Option<Pipe::Reader> reader = response->reader;
     ASSERT_SOME(reader);
 
     Reader<Event> responseDecoder(Decoder<Event>(deserializer), reader.get());
@@ -436,11 +436,11 @@ TEST_P(SchedulerHttpApiTest, SubscribedOnRetry)
     AWAIT_READY(event);
     ASSERT_SOME(event.get());
 
-    frameworkId = event.get().get().subscribed().framework_id();
+    frameworkId = event->get().subscribed().framework_id();
 
     // Check event type is subscribed and the framework id is set.
-    ASSERT_EQ(Event::SUBSCRIBED, event.get().get().type());
-    EXPECT_NE("", event.get().get().subscribed().framework_id().value());
+    ASSERT_EQ(Event::SUBSCRIBED, event->get().type());
+    EXPECT_NE("", event->get().subscribed().framework_id().value());
   }
 
   {
@@ -454,7 +454,7 @@ TEST_P(SchedulerHttpApiTest, SubscribedOnRetry)
         serialize(call, contentType),
         contentType);
 
-    Option<Pipe::Reader> reader = response.get().reader;
+    Option<Pipe::Reader> reader = response->reader;
     ASSERT_SOME(reader);
 
     Reader<Event> responseDecoder(Decoder<Event>(deserializer), reader.get());
@@ -465,15 +465,15 @@ TEST_P(SchedulerHttpApiTest, SubscribedOnRetry)
     ASSERT_SOME(event.get());
 
     // Check event type is subscribed and the same framework id is set.
-    ASSERT_EQ(Event::SUBSCRIBED, event.get().get().type());
-    EXPECT_EQ(frameworkId, event.get().get().subscribed().framework_id());
+    ASSERT_EQ(Event::SUBSCRIBED, event->get().type());
+    EXPECT_EQ(frameworkId, event->get().subscribed().framework_id());
 
     // Make sure it receives a heartbeat.
     event = responseDecoder.read();
     AWAIT_READY(event);
     ASSERT_SOME(event.get());
 
-    ASSERT_EQ(Event::HEARTBEAT, event.get().get().type());
+    ASSERT_EQ(Event::HEARTBEAT, event->get().type());
   }
 }
 
@@ -506,7 +506,7 @@ TEST_P(SchedulerHttpApiTest, UpdatePidToHttpScheduler)
   driver.start();
 
   AWAIT_READY(frameworkId);
-  EXPECT_NE("", frameworkId.get().value());
+  EXPECT_NE("", frameworkId->value());
 
   // Now try to subscribe as an HTTP framework.
   Call call;
@@ -534,9 +534,9 @@ TEST_P(SchedulerHttpApiTest, UpdatePidToHttpScheduler)
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
   AWAIT_EXPECT_RESPONSE_HEADER_EQ("chunked", "Transfer-Encoding", response);
-  ASSERT_EQ(Response::PIPE, response.get().type);
+  ASSERT_EQ(Response::PIPE, response->type);
 
-  Option<Pipe::Reader> reader = response.get().reader;
+  Option<Pipe::Reader> reader = response->reader;
   ASSERT_SOME(reader);
 
   auto deserializer = lambda::bind(
@@ -549,16 +549,16 @@ TEST_P(SchedulerHttpApiTest, UpdatePidToHttpScheduler)
   ASSERT_SOME(event.get());
 
   // Check event type is subscribed and the framework id is set.
-  ASSERT_EQ(Event::SUBSCRIBED, event.get().get().type());
+  ASSERT_EQ(Event::SUBSCRIBED, event->get().type());
   EXPECT_EQ(evolve(frameworkId.get()),
-            event.get().get().subscribed().framework_id());
+            event->get().subscribed().framework_id());
 
   // Make sure it receives a heartbeat.
   event = responseDecoder.read();
   AWAIT_READY(event);
   ASSERT_SOME(event.get());
 
-  ASSERT_EQ(Event::HEARTBEAT, event.get().get().type());
+  ASSERT_EQ(Event::HEARTBEAT, event->get().type());
 
   driver.stop();
   driver.join();
@@ -595,9 +595,9 @@ TEST_P(SchedulerHttpApiTest, UpdateHttpToPidScheduler)
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
   AWAIT_EXPECT_RESPONSE_HEADER_EQ("chunked", "Transfer-Encoding", response);
-  ASSERT_EQ(Response::PIPE, response.get().type);
+  ASSERT_EQ(Response::PIPE, response->type);
 
-  Option<Pipe::Reader> reader = response.get().reader;
+  Option<Pipe::Reader> reader = response->reader;
   ASSERT_SOME(reader);
 
   auto deserializer = lambda::bind(
@@ -610,16 +610,16 @@ TEST_P(SchedulerHttpApiTest, UpdateHttpToPidScheduler)
   ASSERT_SOME(event.get());
 
   // Check event type is subscribed and the framework id is set.
-  ASSERT_EQ(Event::SUBSCRIBED, event.get().get().type());
+  ASSERT_EQ(Event::SUBSCRIBED, event->get().type());
   frameworkInfo.mutable_id()->
-    CopyFrom(event.get().get().subscribed().framework_id());
+    CopyFrom(event->get().subscribed().framework_id());
 
   // Make sure it receives a heartbeat.
   event = responseDecoder.read();
   AWAIT_READY(event);
   ASSERT_SOME(event.get());
 
-  ASSERT_EQ(Event::HEARTBEAT, event.get().get().type());
+  ASSERT_EQ(Event::HEARTBEAT, event->get().type());
 
   MockScheduler sched;
   MesosSchedulerDriver driver(
@@ -776,10 +776,10 @@ TEST_P(SchedulerHttpApiTest, TeardownWithoutStreamId)
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
     AWAIT_EXPECT_RESPONSE_HEADER_EQ("chunked", "Transfer-Encoding", response);
-    ASSERT_EQ(Response::PIPE, response.get().type);
-    ASSERT_TRUE(response.get().headers.contains("Mesos-Stream-Id"));
+    ASSERT_EQ(Response::PIPE, response->type);
+    ASSERT_TRUE(response->headers.contains("Mesos-Stream-Id"));
 
-    Option<Pipe::Reader> reader = response.get().reader;
+    Option<Pipe::Reader> reader = response->reader;
     ASSERT_SOME(reader);
 
     auto deserializer = lambda::bind(
@@ -792,10 +792,10 @@ TEST_P(SchedulerHttpApiTest, TeardownWithoutStreamId)
     ASSERT_SOME(event.get());
 
     // Check event type is subscribed and the framework ID is set.
-    ASSERT_EQ(Event::SUBSCRIBED, event.get().get().type());
-    EXPECT_NE("", event.get().get().subscribed().framework_id().value());
+    ASSERT_EQ(Event::SUBSCRIBED, event->get().type());
+    EXPECT_NE("", event->get().subscribed().framework_id().value());
 
-    frameworkId = event.get().get().subscribed().framework_id();
+    frameworkId = event->get().subscribed().framework_id();
   }
 
   {
@@ -849,12 +849,12 @@ TEST_P(SchedulerHttpApiTest, TeardownWrongStreamId)
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
     AWAIT_EXPECT_RESPONSE_HEADER_EQ("chunked", "Transfer-Encoding", response);
-    ASSERT_EQ(Response::PIPE, response.get().type);
-    ASSERT_TRUE(response.get().headers.contains("Mesos-Stream-Id"));
+    ASSERT_EQ(Response::PIPE, response->type);
+    ASSERT_TRUE(response->headers.contains("Mesos-Stream-Id"));
 
-    streamId = response.get().headers.at("Mesos-Stream-Id");
+    streamId = response->headers.at("Mesos-Stream-Id");
 
-    Option<Pipe::Reader> reader = response.get().reader;
+    Option<Pipe::Reader> reader = response->reader;
     ASSERT_SOME(reader);
 
     auto deserializer = lambda::bind(
@@ -867,10 +867,10 @@ TEST_P(SchedulerHttpApiTest, TeardownWrongStreamId)
     ASSERT_SOME(event.get());
 
     // Check that the event type is subscribed and the framework ID is set.
-    ASSERT_EQ(Event::SUBSCRIBED, event.get().get().type());
-    EXPECT_NE("", event.get().get().subscribed().framework_id().value());
+    ASSERT_EQ(Event::SUBSCRIBED, event->get().type());
+    EXPECT_NE("", event->get().subscribed().framework_id().value());
 
-    frameworkId = event.get().get().subscribed().framework_id();
+    frameworkId = event->get().subscribed().framework_id();
   }
 
   // Subscribe again to invalidate the first stream ID and acquire another one.
@@ -894,13 +894,13 @@ TEST_P(SchedulerHttpApiTest, TeardownWrongStreamId)
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
     AWAIT_EXPECT_RESPONSE_HEADER_EQ("chunked", "Transfer-Encoding", response);
-    ASSERT_EQ(Response::PIPE, response.get().type);
-    ASSERT_TRUE(response.get().headers.contains("Mesos-Stream-Id"));
+    ASSERT_EQ(Response::PIPE, response->type);
+    ASSERT_TRUE(response->headers.contains("Mesos-Stream-Id"));
 
     // Make sure that the new stream ID is different.
-    ASSERT_NE(streamId, response.get().headers.at("Mesos-Stream-Id"));
+    ASSERT_NE(streamId, response->headers.at("Mesos-Stream-Id"));
 
-    Option<Pipe::Reader> reader = response.get().reader;
+    Option<Pipe::Reader> reader = response->reader;
     ASSERT_SOME(reader);
 
     auto deserializer = lambda::bind(
@@ -912,8 +912,8 @@ TEST_P(SchedulerHttpApiTest, TeardownWrongStreamId)
     AWAIT_READY(event);
     ASSERT_SOME(event.get());
 
-    ASSERT_EQ(Event::SUBSCRIBED, event.get().get().type());
-    EXPECT_NE("", event.get().get().subscribed().framework_id().value());
+    ASSERT_EQ(Event::SUBSCRIBED, event->get().type());
+    EXPECT_NE("", event->get().subscribed().framework_id().value());
   }
 
   {
@@ -967,12 +967,12 @@ TEST_P(SchedulerHttpApiTest, MalformedUUID)
         contentType);
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
-    ASSERT_EQ(Response::PIPE, response.get().type);
-    ASSERT_TRUE(response.get().headers.contains("Mesos-Stream-Id"));
+    ASSERT_EQ(Response::PIPE, response->type);
+    ASSERT_TRUE(response->headers.contains("Mesos-Stream-Id"));
 
-    streamId = response.get().headers.at("Mesos-Stream-Id");
+    streamId = response->headers.at("Mesos-Stream-Id");
 
-    Option<Pipe::Reader> reader = response.get().reader;
+    Option<Pipe::Reader> reader = response->reader;
     ASSERT_SOME(reader);
 
     auto deserializer = lambda::bind(
@@ -985,9 +985,9 @@ TEST_P(SchedulerHttpApiTest, MalformedUUID)
     ASSERT_SOME(event.get());
 
     // Check that the event type is subscribed and the framework ID is set.
-    ASSERT_EQ(Event::SUBSCRIBED, event.get().get().type());
+    ASSERT_EQ(Event::SUBSCRIBED, event->get().type());
 
-    frameworkId = event.get().get().subscribed().framework_id();
+    frameworkId = event->get().subscribed().framework_id();
     EXPECT_NE("", frameworkId.value());
   }
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/scheduler_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/scheduler_tests.cpp b/src/tests/scheduler_tests.cpp
index 1ff423f..65259b4 100644
--- a/src/tests/scheduler_tests.cpp
+++ b/src/tests/scheduler_tests.cpp
@@ -202,7 +202,7 @@ TEST_P(SchedulerTest, SchedulerFailover)
 
   AWAIT_READY(subscribed);
 
-  v1::FrameworkID frameworkId = subscribed.get().framework_id();
+  v1::FrameworkID frameworkId = subscribed->framework_id();
 
   auto scheduler2 = std::make_shared<v1::MockHTTPScheduler>();
 
@@ -250,7 +250,7 @@ TEST_P(SchedulerTest, SchedulerFailover)
   AWAIT_READY(disconnected);
   AWAIT_READY(subscribed);
 
-  EXPECT_EQ(frameworkId, subscribed.get().framework_id());
+  EXPECT_EQ(frameworkId, subscribed->framework_id());
 }
 
 
@@ -297,7 +297,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(SchedulerTest, MasterFailover)
 
   AWAIT_READY(subscribed);
 
-  v1::FrameworkID frameworkId = subscribed.get().framework_id();
+  v1::FrameworkID frameworkId = subscribed->framework_id();
 
   Future<Nothing> disconnected;
   EXPECT_CALL(*scheduler, disconnected(_))
@@ -336,7 +336,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(SchedulerTest, MasterFailover)
 
   AWAIT_READY(subscribed);
 
-  EXPECT_EQ(frameworkId, subscribed.get().framework_id());
+  EXPECT_EQ(frameworkId, subscribed->framework_id());
 }
 
 
@@ -386,7 +386,7 @@ TEST_P(SchedulerTest, MetricsEndpoint)
   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);
 
@@ -455,7 +455,7 @@ TEST_P(SchedulerTest, TaskRunning)
 
   AWAIT_READY(subscribed);
 
-  v1::FrameworkID frameworkId(subscribed.get().framework_id());
+  v1::FrameworkID frameworkId(subscribed->framework_id());
 
   AWAIT_READY(offers);
   EXPECT_NE(0, offers->offers().size());
@@ -832,7 +832,7 @@ TEST_P(SchedulerTest, KillTask)
 
   AWAIT_READY(subscribed);
 
-  v1::FrameworkID frameworkId(subscribed.get().framework_id());
+  v1::FrameworkID frameworkId(subscribed->framework_id());
 
   AWAIT_READY(offers);
   EXPECT_NE(0, offers->offers().size());

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/script.cpp
----------------------------------------------------------------------
diff --git a/src/tests/script.cpp b/src/tests/script.cpp
index deec248..1f5dac4 100644
--- a/src/tests/script.cpp
+++ b/src/tests/script.cpp
@@ -164,7 +164,7 @@ void execute(const string& script)
     os::setenv("MESOS_ACLS", "file://" + aclsPath);
 
     // Now execute the script.
-    execl(path.get().c_str(), path.get().c_str(), (char*) nullptr);
+    execl(path->c_str(), path->c_str(), (char*) nullptr);
 
     std::cerr << "Failed to execute '" << script << "': "
               << os::strerror(errno) << std::endl;

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/slave_authorization_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_authorization_tests.cpp b/src/tests/slave_authorization_tests.cpp
index 61c4446..8998ff7 100644
--- a/src/tests/slave_authorization_tests.cpp
+++ b/src/tests/slave_authorization_tests.cpp
@@ -186,7 +186,7 @@ TYPED_TEST(SlaveAuthorizerTest, FilterStateEndpoint)
   AWAIT_READY(registered);
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("test");
@@ -206,7 +206,7 @@ TYPED_TEST(SlaveAuthorizerTest, FilterStateEndpoint)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   // Retrieve endpoint with the user allowed to view the framework.
   {
@@ -217,9 +217,9 @@ TYPED_TEST(SlaveAuthorizerTest, FilterStateEndpoint)
         createBasicAuthHeaders(DEFAULT_CREDENTIAL));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-      << response.get().body;
+      << response->body;
 
-    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
+    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
     ASSERT_SOME(parse);
 
     JSON::Object state = parse.get();
@@ -249,9 +249,9 @@ TYPED_TEST(SlaveAuthorizerTest, FilterStateEndpoint)
         createBasicAuthHeaders(DEFAULT_CREDENTIAL_2));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-      << response.get().body;
+      << response->body;
 
-    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
+    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
     ASSERT_SOME(parse);
 
     JSON::Object state = parse.get();
@@ -320,7 +320,7 @@ TYPED_TEST(SlaveAuthorizerTest, ViewFlags)
         createBasicAuthHeaders(DEFAULT_CREDENTIAL));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-        << response.get().body;
+        << response->body;
 
     response = http::get(
         agent.get()->pid,
@@ -329,9 +329,9 @@ TYPED_TEST(SlaveAuthorizerTest, ViewFlags)
         createBasicAuthHeaders(DEFAULT_CREDENTIAL));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-        << response.get().body;
+        << response->body;
 
-    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
+    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
     ASSERT_SOME(parse);
     JSON::Object state = parse.get();
 
@@ -349,7 +349,7 @@ TYPED_TEST(SlaveAuthorizerTest, ViewFlags)
         createBasicAuthHeaders(DEFAULT_CREDENTIAL_2));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(Forbidden().status, response)
-        << response.get().body;
+        << response->body;
 
     response = http::get(
         agent.get()->pid,
@@ -358,9 +358,9 @@ TYPED_TEST(SlaveAuthorizerTest, ViewFlags)
         createBasicAuthHeaders(DEFAULT_CREDENTIAL_2));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-        << response.get().body;
+        << response->body;
 
-    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
+    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
     ASSERT_SOME(parse);
     JSON::Object state = parse.get();
 
@@ -426,18 +426,18 @@ TEST_P(SlaveEndpointTest, AuthorizedRequest)
   AWAIT_READY(request);
 
   const string principal = DEFAULT_CREDENTIAL.principal();
-  EXPECT_EQ(principal, request.get().subject().value());
+  EXPECT_EQ(principal, request->subject().value());
 
   // TODO(bbannier): Once agent endpoint handlers use more than just
   // `GET_ENDPOINT_WITH_PATH` we should factor out the request method
   // and expected authorization action and parameterize
   // `SlaveEndpointTest` on that as well in addition to the endpoint.
-  EXPECT_EQ(authorization::GET_ENDPOINT_WITH_PATH, request.get().action());
+  EXPECT_EQ(authorization::GET_ENDPOINT_WITH_PATH, request->action());
 
-  EXPECT_EQ("/" + endpoint, request.get().object().value());
+  EXPECT_EQ("/" + endpoint, request->object().value());
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-    << response.get().body;
+    << response->body;
 }
 
 
@@ -472,7 +472,7 @@ TEST_P(SlaveEndpointTest, UnauthorizedRequest)
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(Forbidden().status, response)
-    << response.get().body;
+    << response->body;
 }
 
 
@@ -503,7 +503,7 @@ TEST_P(SlaveEndpointTest, NoAuthorizer)
       createBasicAuthHeaders(DEFAULT_CREDENTIAL));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-    << response.get().body;
+    << response->body;
 }
 
 } // namespace tests {


[4/8] mesos git commit: Replace `.get().` in favor of the `->` operator in tests.

Posted by bm...@apache.org.
http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index cacb556..d610a40 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -153,7 +153,7 @@ TEST_F(MasterTest, TaskRunning)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Ensure the hostname and url are set correctly.
   EXPECT_EQ(
@@ -196,9 +196,9 @@ TEST_F(MasterTest, TaskRunning)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
-  EXPECT_TRUE(status.get().has_executor_id());
-  EXPECT_EQ(exec.id, status.get().executor_id());
+  EXPECT_EQ(TASK_RUNNING, status->state());
+  EXPECT_TRUE(status->has_executor_id());
+  EXPECT_EQ(exec.id, status->executor_id());
 
   AWAIT_READY(update);
 
@@ -243,7 +243,7 @@ TEST_F(MasterTest, ShutdownFrameworkWhileTaskRunning)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
   Offer offer = offers.get()[0];
 
   TaskInfo task;
@@ -271,7 +271,7 @@ TEST_F(MasterTest, ShutdownFrameworkWhileTaskRunning)
   driver.launchTasks(offer.id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   AWAIT_READY(update);
 
@@ -313,11 +313,11 @@ TEST_F(MasterTest, ShutdownFrameworkWhileTaskRunning)
 
   // These checks are not essential for the test, but may help
   // understand what went wrong.
-  Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
+  Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
   ASSERT_SOME(parse);
 
   // Make sure the task landed in completed and marked as killed.
-  Result<JSON::String> state = parse.get().find<JSON::String>(
+  Result<JSON::String> state = parse->find<JSON::String>(
       "completed_frameworks[0].completed_tasks[0].state");
 
   ASSERT_SOME_EQ(JSON::String("TASK_KILLED"), state);
@@ -350,7 +350,7 @@ TEST_F(MasterTest, KillTask)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskID taskId;
   taskId.set_value("1");
@@ -374,7 +374,7 @@ TEST_F(MasterTest, KillTask)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   EXPECT_CALL(exec, killTask(_, _))
     .WillOnce(SendStatusUpdateFromTaskID(TASK_KILLED));
@@ -385,7 +385,7 @@ TEST_F(MasterTest, KillTask)
   driver.killTask(taskId);
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_KILLED, status.get().state());
+  EXPECT_EQ(TASK_KILLED, status->state());
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -423,7 +423,7 @@ TEST_F(MasterTest, KillUnknownTask)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskID taskId;
   taskId.set_value("1");
@@ -447,7 +447,7 @@ TEST_F(MasterTest, KillUnknownTask)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   EXPECT_CALL(sched, statusUpdate(&driver, _))
     .WillOnce(FutureArg<1>(&status));
@@ -459,9 +459,9 @@ TEST_F(MasterTest, KillUnknownTask)
 
   AWAIT_READY(status);
 
-  EXPECT_EQ(TASK_LOST, status.get().state());
-  EXPECT_EQ(TaskStatus::SOURCE_MASTER, status.get().source());
-  EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, status.get().reason());
+  EXPECT_EQ(TASK_LOST, status->state());
+  EXPECT_EQ(TaskStatus::SOURCE_MASTER, status->source());
+  EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, status->reason());
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -511,7 +511,7 @@ TEST_F(MasterTest, KillUnknownTaskSlaveInTransition)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Start a task.
   TaskInfo task = createTask(offers.get()[0], "", DEFAULT_EXECUTOR_ID);
@@ -528,7 +528,7 @@ TEST_F(MasterTest, KillUnknownTaskSlaveInTransition)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -573,7 +573,7 @@ TEST_F(MasterTest, KillUnknownTaskSlaveInTransition)
   AWAIT_READY(reregister);
   EXPECT_NE(
       nullptr,
-      dynamic_cast<master::MarkSlaveReachable*>(reregister.get().get()));
+      dynamic_cast<master::MarkSlaveReachable*>(reregister->get()));
 
   // As Master::killTask isn't doing anything, we shouldn't get a status update.
   EXPECT_CALL(sched, statusUpdate(&driver, _))
@@ -665,7 +665,7 @@ TEST_F(MasterTest, EndpointsForHalfRemovedSlave)
   AWAIT_READY(unreachable);
   EXPECT_NE(
       nullptr,
-      dynamic_cast<master::MarkSlaveUnreachable*>(unreachable.get().get()));
+      dynamic_cast<master::MarkSlaveUnreachable*>(unreachable->get()));
 
   // Settle the clock for the sake of paranoia.
   Clock::settle();
@@ -689,10 +689,10 @@ TEST_F(MasterTest, EndpointsForHalfRemovedSlave)
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response1);
   AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response1);
 
-  Try<JSON::Object> parse1 = JSON::parse<JSON::Object>(response1.get().body);
-  Result<JSON::Array> array1 = parse1.get().find<JSON::Array>("slaves");
+  Try<JSON::Object> parse1 = JSON::parse<JSON::Object>(response1->body);
+  Result<JSON::Array> array1 = parse1->find<JSON::Array>("slaves");
   ASSERT_SOME(array1);
-  EXPECT_EQ(1u, array1.get().values.size());
+  EXPECT_EQ(1u, array1->values.size());
 
   // Allow the registry operation to return success. Note that we
   // don't actually update the registry here, since the test doesn't
@@ -719,10 +719,10 @@ TEST_F(MasterTest, EndpointsForHalfRemovedSlave)
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response2);
   AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response2);
 
-  Try<JSON::Object> parse2 = JSON::parse<JSON::Object>(response2.get().body);
-  Result<JSON::Array> array2 = parse2.get().find<JSON::Array>("slaves");
+  Try<JSON::Object> parse2 = JSON::parse<JSON::Object>(response2->body);
+  Result<JSON::Array> array2 = parse2->find<JSON::Array>("slaves");
   ASSERT_SOME(array2);
-  EXPECT_EQ(0u, array2.get().values.size());
+  EXPECT_EQ(0u, array2->values.size());
 
   Clock::resume();
 }
@@ -754,7 +754,7 @@ TEST_F(MasterTest, StatusUpdateAck)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("");
@@ -781,7 +781,7 @@ TEST_F(MasterTest, StatusUpdateAck)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   // Ensure the slave gets a status update ACK.
   AWAIT_READY(acknowledgement);
@@ -826,7 +826,7 @@ TEST_F(MasterTest, RecoverResources)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   ExecutorInfo executorInfo;
   executorInfo.MergeFrom(DEFAULT_EXECUTOR_INFO);
@@ -860,7 +860,7 @@ TEST_F(MasterTest, RecoverResources)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   EXPECT_CALL(exec, killTask(_, _))
     .WillOnce(SendStatusUpdateFromTaskID(TASK_KILLED));
@@ -875,12 +875,12 @@ TEST_F(MasterTest, RecoverResources)
   driver.killTask(taskId);
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_KILLED, status.get().state());
+  EXPECT_EQ(TASK_KILLED, status->state());
 
   driver.reviveOffers(); // Don't wait till the next allocation.
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   Offer offer = offers.get()[0];
   EXPECT_EQ(taskResources, offer.resources());
@@ -912,7 +912,7 @@ TEST_F(MasterTest, RecoverResources)
   // the allocator tests for inspiration.
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   Resources slaveResources = Resources::parse(flags.resources.get()).get();
   EXPECT_EQ(allocatedResources(slaveResources, DEFAULT_FRAMEWORK_INFO.role()),
@@ -949,7 +949,7 @@ TEST_F(MasterTest, FrameworkMessage)
   schedDriver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("");
@@ -972,7 +972,7 @@ TEST_F(MasterTest, FrameworkMessage)
   schedDriver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   Future<string> execData;
   EXPECT_CALL(exec, frameworkMessage(_, _))
@@ -1036,7 +1036,7 @@ TEST_F(MasterTest, MultipleExecutors)
   driver.start();
 
   AWAIT_READY(offers);
-  ASSERT_NE(0u, offers.get().size());
+  ASSERT_NE(0u, offers->size());
 
   TaskInfo task1;
   task1.set_name("");
@@ -1080,16 +1080,16 @@ TEST_F(MasterTest, MultipleExecutors)
   driver.launchTasks(offers.get()[0].id(), tasks);
 
   AWAIT_READY(exec1Task);
-  EXPECT_EQ(task1.task_id(), exec1Task.get().task_id());
+  EXPECT_EQ(task1.task_id(), exec1Task->task_id());
 
   AWAIT_READY(exec2Task);
-  EXPECT_EQ(task2.task_id(), exec2Task.get().task_id());
+  EXPECT_EQ(task2.task_id(), exec2Task->task_id());
 
   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());
 
   EXPECT_CALL(exec1, shutdown(_))
     .Times(AtMost(1));
@@ -1125,10 +1125,10 @@ TEST_F(MasterTest, MasterInfo)
   driver.start();
 
   AWAIT_READY(masterInfo);
-  EXPECT_EQ(master.get()->pid.address.port, masterInfo.get().port());
+  EXPECT_EQ(master.get()->pid.address.port, masterInfo->port());
   EXPECT_EQ(
       master.get()->pid.address.ip,
-      net::IP(ntohl(masterInfo.get().ip())));
+      net::IP(ntohl(masterInfo->ip())));
 
   driver.stop();
   driver.join();
@@ -1183,12 +1183,12 @@ TEST_F(MasterTest, MasterInfoOnReElection)
   AWAIT_READY(disconnected);
 
   AWAIT_READY(masterInfo);
-  EXPECT_EQ(master.get()->pid.address.port, masterInfo.get().port());
+  EXPECT_EQ(master.get()->pid.address.port, masterInfo->port());
   EXPECT_EQ(
       master.get()->pid.address.ip,
-      net::IP(ntohl(masterInfo.get().ip())));
+      net::IP(ntohl(masterInfo->ip())));
 
-  EXPECT_EQ(MESOS_VERSION, masterInfo.get().version());
+  EXPECT_EQ(MESOS_VERSION, masterInfo->version());
 
   // Advance the clock and trigger a batch allocation.
   Clock::pause();
@@ -1375,7 +1375,7 @@ TEST_F(MasterTest, LaunchCombinedOfferTest)
   driver.start();
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
   Resources resources1(offers1.get()[0].resources());
   EXPECT_EQ(2, resources1.cpus().get());
   EXPECT_EQ(Megabytes(1024), resources1.mem().get());
@@ -1407,7 +1407,7 @@ TEST_F(MasterTest, LaunchCombinedOfferTest)
   driver.launchTasks(offers1.get()[0].id(), {task1}, filters);
 
   AWAIT_READY(status1);
-  EXPECT_EQ(TASK_RUNNING, status1.get().state());
+  EXPECT_EQ(TASK_RUNNING, status1->state());
 
   // Advance the clock and trigger a batch allocation.
   Clock::pause();
@@ -1416,7 +1416,7 @@ TEST_F(MasterTest, LaunchCombinedOfferTest)
 
   // Await 2nd offer.
   AWAIT_READY(offers2);
-  EXPECT_NE(0u, offers2.get().size());
+  EXPECT_NE(0u, offers2->size());
 
   Resources resources2(offers2.get()[0].resources());
   EXPECT_EQ(1, resources2.cpus().get());
@@ -1439,7 +1439,7 @@ TEST_F(MasterTest, LaunchCombinedOfferTest)
   driver.killTask(taskId1);
 
   AWAIT_READY(status2);
-  EXPECT_EQ(TASK_KILLED, status2.get().state());
+  EXPECT_EQ(TASK_KILLED, status2->state());
 
   // Advance the clock and trigger a batch allocation.
   Clock::pause();
@@ -1448,7 +1448,7 @@ TEST_F(MasterTest, LaunchCombinedOfferTest)
 
   // Await 3rd offer - 2nd and 3rd offer to same slave are now ready.
   AWAIT_READY(offers3);
-  EXPECT_NE(0u, offers3.get().size());
+  EXPECT_NE(0u, offers3->size());
   Resources resources3(offers3.get()[0].resources());
   EXPECT_EQ(1, resources3.cpus().get());
   EXPECT_EQ(Megabytes(512), resources3.mem().get());
@@ -1474,7 +1474,7 @@ TEST_F(MasterTest, LaunchCombinedOfferTest)
   driver.launchTasks(combinedOffers, {task2});
 
   AWAIT_READY(status3);
-  EXPECT_EQ(TASK_RUNNING, status3.get().state());
+  EXPECT_EQ(TASK_RUNNING, status3->state());
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -1521,7 +1521,7 @@ TEST_F(MasterTest, LaunchAcrossSlavesLost)
   driver.start();
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
   Resources resources1(offers1.get()[0].resources());
   EXPECT_EQ(2, resources1.cpus().get());
   EXPECT_EQ(Megabytes(1024), resources1.mem().get());
@@ -1541,7 +1541,7 @@ TEST_F(MasterTest, LaunchAcrossSlavesLost)
   ASSERT_SOME(slave2);
 
   AWAIT_READY(offers2);
-  EXPECT_NE(0u, offers2.get().size());
+  EXPECT_NE(0u, offers2->size());
   Resources resources2(offers1.get()[0].resources());
   EXPECT_EQ(2, resources2.cpus().get());
   EXPECT_EQ(Megabytes(1024), resources2.mem().get());
@@ -1567,8 +1567,8 @@ TEST_F(MasterTest, LaunchAcrossSlavesLost)
   driver.launchTasks(combinedOffers, {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_LOST, status.get().state());
-  EXPECT_EQ(TaskStatus::REASON_INVALID_OFFERS, status.get().reason());
+  EXPECT_EQ(TASK_LOST, status->state());
+  EXPECT_EQ(TaskStatus::REASON_INVALID_OFFERS, status->reason());
 
   // The resources of the invalid offers should be recovered.
   AWAIT_READY(recoverResources);
@@ -1630,7 +1630,7 @@ TEST_F(MasterTest, LaunchAcrossSlavesDropped)
   driver.start();
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
   Resources resources1(offers1.get()[0].resources());
   EXPECT_EQ(2, resources1.cpus().get());
   EXPECT_EQ(Megabytes(1024), resources1.mem().get());
@@ -1650,7 +1650,7 @@ TEST_F(MasterTest, LaunchAcrossSlavesDropped)
   ASSERT_SOME(slave2);
 
   AWAIT_READY(offers2);
-  EXPECT_NE(0u, offers2.get().size());
+  EXPECT_NE(0u, offers2->size());
   Resources resources2(offers1.get()[0].resources());
   EXPECT_EQ(2, resources2.cpus().get());
   EXPECT_EQ(Megabytes(1024), resources2.mem().get());
@@ -1676,8 +1676,8 @@ TEST_F(MasterTest, LaunchAcrossSlavesDropped)
   driver.launchTasks(combinedOffers, {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_DROPPED, status.get().state());
-  EXPECT_EQ(TaskStatus::REASON_INVALID_OFFERS, status.get().reason());
+  EXPECT_EQ(TASK_DROPPED, status->state());
+  EXPECT_EQ(TaskStatus::REASON_INVALID_OFFERS, status->reason());
 
   // The resources of the invalid offers should be recovered.
   AWAIT_READY(recoverResources);
@@ -1741,7 +1741,7 @@ TEST_F(MasterTest, LaunchDuplicateOfferLost)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
   Resources resources(offers.get()[0].resources());
   EXPECT_EQ(2, resources.cpus().get());
   EXPECT_EQ(Megabytes(1024), resources.mem().get());
@@ -1768,8 +1768,8 @@ TEST_F(MasterTest, LaunchDuplicateOfferLost)
   driver.launchTasks(combinedOffers, {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_LOST, status.get().state());
-  EXPECT_EQ(TaskStatus::REASON_INVALID_OFFERS, status.get().reason());
+  EXPECT_EQ(TASK_LOST, status->state());
+  EXPECT_EQ(TaskStatus::REASON_INVALID_OFFERS, status->reason());
 
   // The resources of the invalid offers should be recovered.
   AWAIT_READY(recoverResources);
@@ -1833,7 +1833,7 @@ TEST_F(MasterTest, LaunchDuplicateOfferDropped)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
   Resources resources(offers.get()[0].resources());
   EXPECT_EQ(2, resources.cpus().get());
   EXPECT_EQ(Megabytes(1024), resources.mem().get());
@@ -1860,8 +1860,8 @@ TEST_F(MasterTest, LaunchDuplicateOfferDropped)
   driver.launchTasks(combinedOffers, {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_DROPPED, status.get().state());
-  EXPECT_EQ(TaskStatus::REASON_INVALID_OFFERS, status.get().reason());
+  EXPECT_EQ(TASK_DROPPED, status->state());
+  EXPECT_EQ(TaskStatus::REASON_INVALID_OFFERS, status->reason());
 
   // The resources of the invalid offers should be recovered.
   AWAIT_READY(recoverResources);
@@ -1980,7 +1980,7 @@ TEST_F(MasterTest, LaunchDifferentRoleLost)
   driver.launchTasks(offers1.get()[0].id(), {task1}, filters);
 
   AWAIT_READY(status1);
-  EXPECT_EQ(TASK_RUNNING, status1.get().state());
+  EXPECT_EQ(TASK_RUNNING, status1->state());
 
   // Advance the clock and trigger a batch allocation.
   Clock::settle();
@@ -2012,7 +2012,7 @@ TEST_F(MasterTest, LaunchDifferentRoleLost)
   driver.killTask(taskId1);
 
   AWAIT_READY(status2);
-  EXPECT_EQ(TASK_KILLED, status2.get().state());
+  EXPECT_EQ(TASK_KILLED, status2->state());
 
   // Advance the clock and trigger a batch allocation.
   Clock::settle();
@@ -2054,8 +2054,8 @@ TEST_F(MasterTest, LaunchDifferentRoleLost)
   Clock::settle();
 
   AWAIT_READY(status3);
-  EXPECT_EQ(TASK_LOST, status3.get().state());
-  EXPECT_EQ(TaskStatus::REASON_INVALID_OFFERS, status3.get().reason());
+  EXPECT_EQ(TASK_LOST, status3->state());
+  EXPECT_EQ(TaskStatus::REASON_INVALID_OFFERS, status3->reason());
 
   // The resources of the invalid offers should be recovered.
   AWAIT_READY(recoverResources);
@@ -2202,7 +2202,7 @@ TEST_F(MasterTest, SlavesEndpointWithoutSlaves)
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
   AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response);
 
-  const Try<JSON::Value> parse = JSON::parse(response.get().body);
+  const Try<JSON::Value> parse = JSON::parse(response->body);
   ASSERT_SOME(parse);
 
   Try<JSON::Value> expected = JSON::parse(
@@ -2257,14 +2257,14 @@ TEST_F(MasterTest, SlavesEndpointTwoSlaves)
   AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response);
 
   const Try<JSON::Object> parse =
-    JSON::parse<JSON::Object>(response.get().body);
+    JSON::parse<JSON::Object>(response->body);
 
   ASSERT_SOME(parse);
 
   // Check that there are two elements in the array.
-  Result<JSON::Array> array = parse.get().find<JSON::Array>("slaves");
+  Result<JSON::Array> array = parse->find<JSON::Array>("slaves");
   ASSERT_SOME(array);
-  EXPECT_EQ(2u, array.get().values.size());
+  EXPECT_EQ(2u, array->values.size());
 }
 
 
@@ -2393,7 +2393,7 @@ TEST_F(MasterTest, UnreachableTaskAfterFailover)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(offers.get()[0], "sleep 100");
 
@@ -2407,10 +2407,10 @@ TEST_F(MasterTest, UnreachableTaskAfterFailover)
   driver.launchTasks(offers.get()[0].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);
 
@@ -2463,9 +2463,9 @@ TEST_F(MasterTest, UnreachableTaskAfterFailover)
   driver.reconcileTasks({status});
 
   AWAIT_READY(reconcileUpdate1);
-  EXPECT_EQ(TASK_LOST, reconcileUpdate1.get().state());
-  EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate1.get().reason());
-  EXPECT_EQ(unreachableTime, reconcileUpdate1.get().unreachable_time());
+  EXPECT_EQ(TASK_LOST, reconcileUpdate1->state());
+  EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, reconcileUpdate1->reason());
+  EXPECT_EQ(unreachableTime, reconcileUpdate1->unreachable_time());
 
   // Cause the slave to re-register with the master.
   Future<SlaveReregisteredMessage> slaveReregisteredMessage =
@@ -2486,8 +2486,8 @@ TEST_F(MasterTest, UnreachableTaskAfterFailover)
   driver.reconcileTasks({status});
 
   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();
 
@@ -2812,7 +2812,7 @@ TEST_F(MasterTest, RecoveredSlaveReregisterThenUnreachableRace)
   EXPECT_NE(
       nullptr,
       dynamic_cast<master::MarkSlaveReachable*>(
-          reregister.get().get()));
+          reregister->get()));
 
   // Advance the clock to cause the agent reregister timeout to
   // expire. Because slave reregistration has already started, we do
@@ -2925,7 +2925,7 @@ TEST_F(MasterZooKeeperTest, MasterInfoAddress)
   driver.start();
   AWAIT_READY(masterInfo);
 
-  const Address& address = masterInfo.get().address();
+  const Address& address = masterInfo->address();
   EXPECT_EQ(stringify(master.get()->pid.address.ip), address.ip());
   EXPECT_EQ(master.get()->pid.address.port, address.port());
 
@@ -2994,7 +2994,7 @@ TEST_F(MasterTest, RecoveredFramework)
   driver.start();
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   // Get the master's state.
   Future<Response> response1 = process::http::get(
@@ -3006,7 +3006,7 @@ TEST_F(MasterTest, RecoveredFramework)
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response1);
   AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response1);
 
-  Try<JSON::Object> parse1 = JSON::parse<JSON::Object>(response1.get().body);
+  Try<JSON::Object> parse1 = JSON::parse<JSON::Object>(response1->body);
   ASSERT_SOME(parse1);
 
   JSON::Array frameworks1 = parse1->values["frameworks"].as<JSON::Array>();
@@ -3077,7 +3077,7 @@ TEST_F(MasterTest, RecoveredFramework)
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response2);
   AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response2);
 
-  Try<JSON::Object> parse2 = JSON::parse<JSON::Object>(response2.get().body);
+  Try<JSON::Object> parse2 = JSON::parse<JSON::Object>(response2->body);
   ASSERT_SOME(parse2);
 
   // Check that there is a single recovered framework, a single active
@@ -3126,7 +3126,7 @@ TEST_F(MasterTest, RecoveredFramework)
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response3);
   AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response3);
 
-  Try<JSON::Object> parse3 = JSON::parse<JSON::Object>(response3.get().body);
+  Try<JSON::Object> parse3 = JSON::parse<JSON::Object>(response3->body);
   ASSERT_SOME(parse3);
 
   // The framework should no longer be listed as recovered.
@@ -3200,7 +3200,7 @@ TEST_F(MasterTest, OrphanTasksMultipleAgents)
   driver.start();
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
 
   TaskInfo task1 =
     createTask(offers1.get()[0], "sleep 100", DEFAULT_EXECUTOR_ID);
@@ -3217,7 +3217,7 @@ TEST_F(MasterTest, OrphanTasksMultipleAgents)
   driver.launchTasks(offers1.get()[0].id(), {task1});
 
   AWAIT_READY(status1);
-  EXPECT_EQ(TASK_RUNNING, status1.get().state());
+  EXPECT_EQ(TASK_RUNNING, status1->state());
 
   // Start the second slave and launch a task.
 
@@ -3235,7 +3235,7 @@ TEST_F(MasterTest, OrphanTasksMultipleAgents)
   ASSERT_SOME(slave2);
 
   AWAIT_READY(offers2);
-  EXPECT_NE(0u, offers2.get().size());
+  EXPECT_NE(0u, offers2->size());
 
   TaskInfo task2 =
     createTask(offers2.get()[0], "sleep 100", DEFAULT_EXECUTOR_ID);
@@ -3253,7 +3253,7 @@ TEST_F(MasterTest, OrphanTasksMultipleAgents)
   driver.launchTasks(offers2.get()[0].id(), {task2});
 
   AWAIT_READY(status2);
-  EXPECT_EQ(TASK_RUNNING, status2.get().state());
+  EXPECT_EQ(TASK_RUNNING, status2->state());
 
   Future<SlaveReregisteredMessage> slaveReregisteredMessage1 =
     FUTURE_PROTOBUF(SlaveReregisteredMessage(), _, slave1.get()->pid);
@@ -3400,7 +3400,7 @@ TEST_F(MasterTest, UnregisteredFrameworksAfterTearDown)
   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);
 
   JSON::Object state = parse.get();
@@ -3439,7 +3439,7 @@ TEST_F(MasterTest, TasksEndpoint)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("test");
@@ -3460,9 +3460,9 @@ TEST_F(MasterTest, TasksEndpoint)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
-  EXPECT_TRUE(status.get().has_executor_id());
-  EXPECT_EQ(exec.id, status.get().executor_id());
+  EXPECT_EQ(TASK_RUNNING, status->state());
+  EXPECT_TRUE(status->has_executor_id());
+  EXPECT_EQ(exec.id, status->executor_id());
 
   Future<Response> response = process::http::get(
       master.get()->pid,
@@ -3473,7 +3473,7 @@ TEST_F(MasterTest, TasksEndpoint)
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
   AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response);
 
-  Try<JSON::Value> value = JSON::parse<JSON::Value>(response.get().body);
+  Try<JSON::Value> value = JSON::parse<JSON::Value>(response->body);
   ASSERT_SOME(value);
 
   Try<JSON::Value> expected = JSON::parse(
@@ -3489,7 +3489,7 @@ TEST_F(MasterTest, TasksEndpoint)
 
   ASSERT_SOME(expected);
 
-  EXPECT_TRUE(value.get().contains(expected.get()));
+  EXPECT_TRUE(value->contains(expected.get()));
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -3532,7 +3532,7 @@ TEST_F(MasterTest, IgnoreEphemeralPortsResource)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_EQ(1u, offers.get().size());
+  EXPECT_EQ(1u, offers->size());
 
   EXPECT_EQ(
       Resources(offers.get()[0].resources()),
@@ -3576,9 +3576,9 @@ TEST_F(MasterTest, MaxExecutorsPerSlave)
   driver.start();
 
   AWAIT_READY(masterInfo);
-  EXPECT_EQ(master.get()->pid.address.port, masterInfo.get().port());
+  EXPECT_EQ(master.get()->pid.address.port, masterInfo->port());
   EXPECT_EQ(
-      master.get()->pid.address.ip, net::IP(ntohl(masterInfo.get().ip())));
+      master.get()->pid.address.ip, net::IP(ntohl(masterInfo->ip())));
 
   driver.stop();
   driver.join();
@@ -3625,7 +3625,7 @@ TEST_F(MasterTest, OfferTimeout)
 
   AWAIT_READY(registered);
   AWAIT_READY(offers1);
-  ASSERT_EQ(1u, offers1.get().size());
+  ASSERT_EQ(1u, offers1->size());
 
   // Now advance the clock, we need to resume it afterwards to
   // allow the allocator to make a new allocation decision.
@@ -3645,7 +3645,7 @@ TEST_F(MasterTest, OfferTimeout)
   // Expect that the resources are re-offered to the framework after
   // the rescind.
   AWAIT_READY(offers2);
-  ASSERT_EQ(1u, offers2.get().size());
+  ASSERT_EQ(1u, offers2->size());
 
   EXPECT_EQ(offers1.get()[0].resources(), offers2.get()[0].resources());
 
@@ -3699,7 +3699,7 @@ TEST_F(MasterTest, OfferNotRescindedOnceUsed)
   AWAIT_READY(registered);
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   // Now advance to the offer timeout, we need to settle the clock to
   // ensure that the offer rescind timeout would be processed
@@ -3832,8 +3832,8 @@ TEST_F(MasterTest, UnacknowledgedTerminalTask)
 
   AWAIT_READY(offers2);
 
-  EXPECT_FALSE(offers1.get().empty());
-  EXPECT_FALSE(offers2.get().empty());
+  EXPECT_FALSE(offers1->empty());
+  EXPECT_FALSE(offers2->empty());
 
   // Ensure we get all of the resources back.
   EXPECT_EQ(offers1.get()[0].resources(), offers2.get()[0].resources());
@@ -3903,7 +3903,7 @@ TEST_F(MasterTest, ReleaseResourcesForTerminalTaskWithPendingUpdates)
 
   // Now send TASK_FINISHED update.
   TaskStatus finishedStatus;
-  finishedStatus = statusUpdateMessage.get().update().status();
+  finishedStatus = statusUpdateMessage->update().status();
   finishedStatus.set_state(TASK_FINISHED);
   execDriver->sendStatusUpdate(finishedStatus);
 
@@ -3952,7 +3952,7 @@ TEST_F(MasterTest, StateEndpoint)
   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);
 
   JSON::Object state = parse.get();
@@ -4173,7 +4173,7 @@ TEST_F(MasterTest, StateSummaryEndpoint)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskID taskId;
   taskId.set_value("1");
@@ -4197,7 +4197,7 @@ TEST_F(MasterTest, StateSummaryEndpoint)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   EXPECT_CALL(exec, killTask(_, _))
     .WillOnce(SendStatusUpdateFromTaskID(TASK_KILLED));
@@ -4208,7 +4208,7 @@ TEST_F(MasterTest, StateSummaryEndpoint)
   driver.killTask(taskId);
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_KILLED, status.get().state());
+  EXPECT_EQ(TASK_KILLED, status->state());
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -4222,7 +4222,7 @@ TEST_F(MasterTest, StateSummaryEndpoint)
   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);
 
   JSON::Object state = parse.get();
@@ -4311,7 +4311,7 @@ TEST_F(MasterTest, RecoveredSlaves)
 
   AWAIT_READY(slaveRegisteredMessage);
 
-  SlaveID slaveID = slaveRegisteredMessage.get().slave_id();
+  SlaveID slaveID = slaveRegisteredMessage->slave_id();
 
   // Stop the slave while the master is down.
   master->reset();
@@ -4337,17 +4337,17 @@ TEST_F(MasterTest, RecoveredSlaves)
     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);
 
-    Result<JSON::Array> array1 = parse.get().find<JSON::Array>("slaves");
+    Result<JSON::Array> array1 = parse->find<JSON::Array>("slaves");
     ASSERT_SOME(array1);
-    EXPECT_EQ(0u, array1.get().values.size());
+    EXPECT_EQ(0u, array1->values.size());
 
     Result<JSON::Array> array2 =
-      parse.get().find<JSON::Array>("recovered_slaves");
+      parse->find<JSON::Array>("recovered_slaves");
 
     ASSERT_SOME(array2);
-    EXPECT_EQ(1u, array2.get().values.size());
+    EXPECT_EQ(1u, array2->values.size());
   }
 
   {
@@ -4361,17 +4361,17 @@ TEST_F(MasterTest, RecoveredSlaves)
     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);
 
-    Result<JSON::Array> array1 = parse.get().find<JSON::Array>("slaves");
+    Result<JSON::Array> array1 = parse->find<JSON::Array>("slaves");
     ASSERT_SOME(array1);
-    EXPECT_EQ(0u, array1.get().values.size());
+    EXPECT_EQ(0u, array1->values.size());
 
     Result<JSON::Array> array2 =
-      parse.get().find<JSON::Array>("recovered_slaves");
+      parse->find<JSON::Array>("recovered_slaves");
 
     ASSERT_SOME(array2);
-    EXPECT_EQ(1u, array2.get().values.size());
+    EXPECT_EQ(1u, array2->values.size());
   }
 
   Future<SlaveReregisteredMessage> slaveReregisteredMessage =
@@ -4399,15 +4399,15 @@ TEST_F(MasterTest, RecoveredSlaves)
     AWAIT_EXPECT_RESPONSE_HEADER_EQ(
         APPLICATION_JSON, "Content-Type", response1);
 
-    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response1.get().body);
-    Result<JSON::Array> array1 = parse.get().find<JSON::Array>("slaves");
+    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response1->body);
+    Result<JSON::Array> array1 = parse->find<JSON::Array>("slaves");
     ASSERT_SOME(array1);
-    EXPECT_EQ(1u, array1.get().values.size());
+    EXPECT_EQ(1u, array1->values.size());
 
     Result<JSON::Array> array2 =
-      parse.get().find<JSON::Array>("recovered_slaves");
+      parse->find<JSON::Array>("recovered_slaves");
     ASSERT_SOME(array2);
-    EXPECT_EQ(0u, array2.get().values.size());
+    EXPECT_EQ(0u, array2->values.size());
   }
 
   {
@@ -4421,15 +4421,15 @@ TEST_F(MasterTest, RecoveredSlaves)
     AWAIT_EXPECT_RESPONSE_HEADER_EQ(
         APPLICATION_JSON, "Content-Type", response1);
 
-    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response1.get().body);
-    Result<JSON::Array> array1 = parse.get().find<JSON::Array>("slaves");
+    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response1->body);
+    Result<JSON::Array> array1 = parse->find<JSON::Array>("slaves");
     ASSERT_SOME(array1);
-    EXPECT_EQ(1u, array1.get().values.size());
+    EXPECT_EQ(1u, array1->values.size());
 
     Result<JSON::Array> array2 =
-      parse.get().find<JSON::Array>("recovered_slaves");
+      parse->find<JSON::Array>("recovered_slaves");
     ASSERT_SOME(array2);
-    EXPECT_EQ(0u, array2.get().values.size());
+    EXPECT_EQ(0u, array2->values.size());
   }
 }
 
@@ -4462,7 +4462,7 @@ TEST_F(MasterTest, ExecutorLabels)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("");
@@ -4490,7 +4490,7 @@ TEST_F(MasterTest, ExecutorLabels)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   // Verify label key and value in the master's state endpoint.
   Future<Response> response = process::http::get(
@@ -4554,7 +4554,7 @@ TEST_F(MasterTest, TaskLabels)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("");
@@ -4588,7 +4588,7 @@ TEST_F(MasterTest, TaskLabels)
   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(update);
 
@@ -4602,10 +4602,10 @@ TEST_F(MasterTest, TaskLabels)
   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);
 
-  Result<JSON::Array> find = parse.get().find<JSON::Array>(
+  Result<JSON::Array> find = parse->find<JSON::Array>(
       "frameworks[0].tasks[0].labels");
   EXPECT_SOME(find);
 
@@ -4658,7 +4658,7 @@ TEST_F(MasterTest, TaskStatusLabels)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(offers.get()[0], "sleep 100", DEFAULT_EXECUTOR_ID);
 
@@ -4680,7 +4680,7 @@ TEST_F(MasterTest, TaskStatusLabels)
 
   // Now send TASK_RUNNING update.
   TaskStatus runningStatus;
-  runningStatus.mutable_task_id()->MergeFrom(execTask.get().task_id());
+  runningStatus.mutable_task_id()->MergeFrom(execTask->task_id());
   runningStatus.set_state(TASK_RUNNING);
 
   // Add three labels to the task (two of which share the same key).
@@ -4704,10 +4704,10 @@ TEST_F(MasterTest, TaskStatusLabels)
   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);
 
-  Result<JSON::Array> find = parse.get().find<JSON::Array>(
+  Result<JSON::Array> find = parse->find<JSON::Array>(
       "frameworks[0].tasks[0].statuses[0].labels");
   EXPECT_SOME(find);
 
@@ -4760,7 +4760,7 @@ TEST_F(MasterTest, TaskStatusContainerStatus)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(offers.get()[0], "sleep 100", DEFAULT_EXECUTOR_ID);
 
@@ -4804,14 +4804,14 @@ TEST_F(MasterTest, TaskStatusContainerStatus)
   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);
 
   // Validate that the IP address passed in by the Slave is available at the
   // state endpoint.
   ASSERT_SOME_EQ(
       slaveIPAddress,
-      parse.get().find<JSON::String>(
+      parse->find<JSON::String>(
           "frameworks[0].tasks[0].statuses[0]"
           ".container_status.network_infos[0]"
           ".ip_addresses[0].ip_address"));
@@ -4898,10 +4898,10 @@ TEST_F(MasterTest, SlaveActiveEndpoint)
   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);
 
-  Result<JSON::Boolean> status = parse.get().find<JSON::Boolean>(
+  Result<JSON::Boolean> status = parse->find<JSON::Boolean>(
       "slaves[0].active");
 
   ASSERT_SOME_EQ(JSON::Boolean(true), status);
@@ -4911,7 +4911,7 @@ TEST_F(MasterTest, SlaveActiveEndpoint)
 
   // Inject a slave exited event at the master causing the master
   // to mark the slave as disconnected.
-  process::inject::exited(slaveRegisteredMessage.get().to, master.get()->pid);
+  process::inject::exited(slaveRegisteredMessage->to, master.get()->pid);
 
   // Wait until master deactivates the slave.
   AWAIT_READY(deactivateSlave);
@@ -4925,10 +4925,10 @@ TEST_F(MasterTest, SlaveActiveEndpoint)
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
 
-  parse = JSON::parse<JSON::Object>(response.get().body);
+  parse = JSON::parse<JSON::Object>(response->body);
   ASSERT_SOME(parse);
 
-  status = parse.get().find<JSON::Boolean>("slaves[0].active");
+  status = parse->find<JSON::Boolean>("slaves[0].active");
 
   ASSERT_SOME_EQ(JSON::Boolean(false), status);
 }
@@ -4962,7 +4962,7 @@ TEST_F(MasterTest, TaskDiscoveryInfo)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("testtask");
@@ -5014,7 +5014,7 @@ TEST_F(MasterTest, TaskDiscoveryInfo)
   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(update);
 
@@ -5028,44 +5028,44 @@ TEST_F(MasterTest, TaskDiscoveryInfo)
   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);
 
-  Result<JSON::String> taskName = parse.get().find<JSON::String>(
+  Result<JSON::String> taskName = parse->find<JSON::String>(
       "frameworks[0].tasks[0].name");
   EXPECT_SOME(taskName);
   ASSERT_EQ("testtask", taskName.get());
 
   // Verify basic content for discovery info.
-  Result<JSON::String> visibility = parse.get().find<JSON::String>(
+  Result<JSON::String> visibility = parse->find<JSON::String>(
       "frameworks[0].tasks[0].discovery.visibility");
   EXPECT_SOME(visibility);
   DiscoveryInfo::Visibility visibility_value;
-  DiscoveryInfo::Visibility_Parse(visibility.get().value, &visibility_value);
+  DiscoveryInfo::Visibility_Parse(visibility->value, &visibility_value);
   ASSERT_EQ(DiscoveryInfo::EXTERNAL, visibility_value);
 
-  Result<JSON::String> discoveryName = parse.get().find<JSON::String>(
+  Result<JSON::String> discoveryName = parse->find<JSON::String>(
       "frameworks[0].tasks[0].discovery.name");
   EXPECT_SOME(discoveryName);
   ASSERT_EQ("mytask", discoveryName.get());
 
-  Result<JSON::String> environment = parse.get().find<JSON::String>(
+  Result<JSON::String> environment = parse->find<JSON::String>(
       "frameworks[0].tasks[0].discovery.environment");
   EXPECT_SOME(environment);
   ASSERT_EQ("mytest", environment.get());
 
-  Result<JSON::String> location = parse.get().find<JSON::String>(
+  Result<JSON::String> location = parse->find<JSON::String>(
       "frameworks[0].tasks[0].discovery.location");
   EXPECT_SOME(location);
   ASSERT_EQ("mylocation", location.get());
 
-  Result<JSON::String> version = parse.get().find<JSON::String>(
+  Result<JSON::String> version = parse->find<JSON::String>(
       "frameworks[0].tasks[0].discovery.version");
   EXPECT_SOME(version);
   ASSERT_EQ("v0.1.1", version.get());
 
   // Verify content of two named ports.
-  Result<JSON::Array> find1 = parse.get().find<JSON::Array>(
+  Result<JSON::Array> find1 = parse->find<JSON::Array>(
       "frameworks[0].tasks[0].discovery.ports.ports");
   EXPECT_SOME(find1);
 
@@ -5094,7 +5094,7 @@ TEST_F(MasterTest, TaskDiscoveryInfo)
   EXPECT_EQ(expected.get(), portsArray.values[1]);
 
   // Verify content of two labels.
-  Result<JSON::Array> find2 = parse.get().find<JSON::Array>(
+  Result<JSON::Array> find2 = parse->find<JSON::Array>(
       "frameworks[0].tasks[0].discovery.labels.labels");
   EXPECT_SOME(find2);
 
@@ -5162,7 +5162,7 @@ TEST_F(MasterTest, MasterFailoverLongLivedExecutor)
   driver.start();
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
 
   TaskInfo task1;
   task1.set_name("");
@@ -5186,7 +5186,7 @@ TEST_F(MasterTest, MasterFailoverLongLivedExecutor)
   driver.launchTasks(offers1.get()[0].id(), {task1});
 
   AWAIT_READY(status1);
-  EXPECT_EQ(TASK_RUNNING, status1.get().state());
+  EXPECT_EQ(TASK_RUNNING, status1->state());
 
   // Fail over master.
   master->reset();
@@ -5203,7 +5203,7 @@ TEST_F(MasterTest, MasterFailoverLongLivedExecutor)
   detector.appoint(master.get()->pid);
 
   AWAIT_READY(offers2);
-  EXPECT_NE(0u, offers2.get().size());
+  EXPECT_NE(0u, offers2->size());
 
   // The second task is a just a copy of the first task (using the
   // same executor and resources). We have to set a new task id.
@@ -5219,7 +5219,7 @@ TEST_F(MasterTest, MasterFailoverLongLivedExecutor)
   driver.launchTasks(offers2.get()[0].id(), {task2});
 
   AWAIT_READY(status2);
-  EXPECT_EQ(TASK_RUNNING, status2.get().state());
+  EXPECT_EQ(TASK_RUNNING, status2->state());
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -5310,10 +5310,10 @@ TEST_F(MasterTest, FrameworkInfoLabels)
   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);
 
-  Result<JSON::Array> labelsObject = parse.get().find<JSON::Array>(
+  Result<JSON::Array> labelsObject = parse->find<JSON::Array>(
       "frameworks[0].labels");
   EXPECT_SOME(labelsObject);
 
@@ -5384,7 +5384,7 @@ TEST_F(MasterTest, FrameworksEndpointWithoutFrameworks)
   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);
 
   JSON::Object frameworks = parse.get();
@@ -5434,12 +5434,12 @@ TEST_F(MasterTest, FrameworksEndpointOneFramework)
   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);
 
-  Result<JSON::Array> array = parse.get().find<JSON::Array>("frameworks");
+  Result<JSON::Array> array = parse->find<JSON::Array>("frameworks");
   ASSERT_SOME(array);
-  EXPECT_EQ(1u, array.get().values.size());
+  EXPECT_EQ(1u, array->values.size());
 
   driver.stop();
   driver.join();
@@ -5883,7 +5883,7 @@ TEST_F(MasterTest, DISABLED_RecoverResourcesOrphanedTask)
 
   AWAIT_READY(subscribed);
 
-  v1::FrameworkID frameworkId = subscribed.get().framework_id();
+  v1::FrameworkID frameworkId = subscribed->framework_id();
 
   AWAIT_READY(offers);
   EXPECT_NE(0, offers->offers().size());
@@ -6019,7 +6019,7 @@ TEST_F(MasterTest, DISABLED_RecoverResourcesOrphanedTask)
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
 
     v1::master::Response::GetTasks tasks = deserialize<v1::master::Response>(
-        contentType, response->body).get().get_tasks();
+        contentType, response->body)->get_tasks();
 
     ASSERT_TRUE(tasks.IsInitialized());
     ASSERT_EQ(1, tasks.tasks().size());
@@ -6082,8 +6082,8 @@ TEST_F(MasterTest, FailoverAgentReregisterFirst)
   driver.launchTasks(offers.get()[0].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());
 
   AWAIT_READY(statusUpdateAck);
 
@@ -6118,7 +6118,7 @@ TEST_F(MasterTest, FailoverAgentReregisterFirst)
     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);
 
     JSON::Array frameworks = parse->values["frameworks"].as<JSON::Array>();
@@ -6176,7 +6176,7 @@ TEST_F(MasterTest, FailoverAgentReregisterFirst)
     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);
 
     JSON::Array frameworks = parse->values["frameworks"].as<JSON::Array>();

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/master_validation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_validation_tests.cpp b/src/tests/master_validation_tests.cpp
index 11dfbc6..5553808 100644
--- a/src/tests/master_validation_tests.cpp
+++ b/src/tests/master_validation_tests.cpp
@@ -819,7 +819,7 @@ TEST_F(CreateOperationValidationTest, InsufficientDiskResource)
   driver.start();
 
   AWAIT_READY(offers1);
-  EXPECT_FALSE(offers1.get().empty());
+  EXPECT_FALSE(offers1->empty());
 
   Offer offer1 = offers1.get()[0];
 
@@ -849,7 +849,7 @@ TEST_F(CreateOperationValidationTest, InsufficientDiskResource)
   Clock::advance(masterFlags.allocation_interval);
 
   AWAIT_READY(offers2);
-  EXPECT_FALSE(offers2.get().empty());
+  EXPECT_FALSE(offers2->empty());
 
   Offer offer2 = offers2.get()[0];
 
@@ -1060,9 +1060,9 @@ TEST_F(TaskValidationTest, ExecutorUsesInvalidFrameworkID)
   driver.start();
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_ERROR, status.get().state());
+  EXPECT_EQ(TASK_ERROR, status->state());
   EXPECT_TRUE(strings::startsWith(
-      status.get().message(), "ExecutorInfo has an invalid FrameworkID"));
+      status->message(), "ExecutorInfo has an invalid FrameworkID"));
 
   // Make sure the task is not known to master anymore.
   EXPECT_CALL(sched, statusUpdate(&driver, _))
@@ -1117,7 +1117,7 @@ TEST_F(TaskValidationTest, ExecutorEnvironmentInvalid)
   driver.start();
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_ERROR, status.get().state());
+  EXPECT_EQ(TASK_ERROR, status->state());
   EXPECT_EQ(
       "Executor's `CommandInfo` is invalid: Environment variable 'ENV_VAR_KEY' "
       "of type 'VALUE' must have a value set",
@@ -1217,7 +1217,7 @@ TEST_F(TaskValidationTest, TaskUsesCommandInfoAndExecutorInfo)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   Future<TaskStatus> status;
   EXPECT_CALL(sched, statusUpdate(&driver, _))
@@ -1230,9 +1230,9 @@ TEST_F(TaskValidationTest, TaskUsesCommandInfoAndExecutorInfo)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_ERROR, status.get().state());
+  EXPECT_EQ(TASK_ERROR, status->state());
   EXPECT_TRUE(strings::contains(
-      status.get().message(), "CommandInfo or ExecutorInfo present"));
+      status->message(), "CommandInfo or ExecutorInfo present"));
 
   driver.stop();
   driver.join();
@@ -1346,7 +1346,7 @@ TEST_F(TaskValidationTest, TaskUsesNoResources)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("");
@@ -1361,11 +1361,11 @@ TEST_F(TaskValidationTest, TaskUsesNoResources)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(task.task_id(), status.get().task_id());
-  EXPECT_EQ(TASK_ERROR, status.get().state());
-  EXPECT_EQ(TaskStatus::REASON_TASK_INVALID, status.get().reason());
-  EXPECT_TRUE(status.get().has_message());
-  EXPECT_EQ("Task uses no resources", status.get().message());
+  EXPECT_EQ(task.task_id(), status->task_id());
+  EXPECT_EQ(TASK_ERROR, status->state());
+  EXPECT_EQ(TaskStatus::REASON_TASK_INVALID, status->reason());
+  EXPECT_TRUE(status->has_message());
+  EXPECT_EQ("Task uses no resources", status->message());
 
   driver.stop();
   driver.join();
@@ -1395,7 +1395,7 @@ TEST_F(TaskValidationTest, TaskUsesMoreResourcesThanOffered)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("");
@@ -1416,12 +1416,12 @@ TEST_F(TaskValidationTest, TaskUsesMoreResourcesThanOffered)
 
   AWAIT_READY(status);
 
-  EXPECT_EQ(task.task_id(), status.get().task_id());
-  EXPECT_EQ(TASK_ERROR, status.get().state());
-  EXPECT_EQ(TaskStatus::REASON_TASK_INVALID, status.get().reason());
-  EXPECT_TRUE(status.get().has_message());
+  EXPECT_EQ(task.task_id(), status->task_id());
+  EXPECT_EQ(TASK_ERROR, status->state());
+  EXPECT_EQ(TaskStatus::REASON_TASK_INVALID, status->reason());
+  EXPECT_TRUE(status->has_message());
   EXPECT_TRUE(strings::contains(
-      status.get().message(), "more than available"));
+      status->message(), "more than available"));
 
   driver.stop();
   driver.join();
@@ -1456,7 +1456,7 @@ TEST_F(TaskValidationTest, DuplicatedTaskID)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   ExecutorInfo executor;
   executor.mutable_executor_id()->set_value("default");
@@ -1495,14 +1495,14 @@ TEST_F(TaskValidationTest, DuplicatedTaskID)
   driver.launchTasks(offers.get()[0].id(), tasks);
 
   AWAIT_READY(task);
-  EXPECT_EQ(task1.task_id(), task.get().task_id());
+  EXPECT_EQ(task1.task_id(), task->task_id());
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_ERROR, status.get().state());
-  EXPECT_EQ(TaskStatus::REASON_TASK_INVALID, status.get().reason());
+  EXPECT_EQ(TASK_ERROR, status->state());
+  EXPECT_EQ(TaskStatus::REASON_TASK_INVALID, status->reason());
 
   EXPECT_TRUE(strings::startsWith(
-      status.get().message(), "Task has duplicate ID"));
+      status->message(), "Task has duplicate ID"));
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -1540,7 +1540,7 @@ TEST_F(TaskValidationTest, ExecutorInfoDiffersOnSameSlave)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   ExecutorInfo executor;
   executor.mutable_executor_id()->set_value("default");
@@ -1582,15 +1582,15 @@ TEST_F(TaskValidationTest, ExecutorInfoDiffersOnSameSlave)
   driver.launchTasks(offers.get()[0].id(), tasks);
 
   AWAIT_READY(task);
-  EXPECT_EQ(task1.task_id(), task.get().task_id());
+  EXPECT_EQ(task1.task_id(), task->task_id());
 
   AWAIT_READY(status);
-  EXPECT_EQ(task2.task_id(), status.get().task_id());
-  EXPECT_EQ(TASK_ERROR, status.get().state());
-  EXPECT_EQ(TaskStatus::REASON_TASK_INVALID, status.get().reason());
-  EXPECT_TRUE(status.get().has_message());
+  EXPECT_EQ(task2.task_id(), status->task_id());
+  EXPECT_EQ(TASK_ERROR, status->state());
+  EXPECT_EQ(TaskStatus::REASON_TASK_INVALID, status->reason());
+  EXPECT_TRUE(status->has_message());
   EXPECT_TRUE(strings::contains(
-      status.get().message(), "ExecutorInfo is not compatible"));
+      status->message(), "ExecutorInfo is not compatible"));
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -1634,7 +1634,7 @@ TEST_F(TaskValidationTest, ExecutorInfoDiffersOnDifferentSlaves)
   ASSERT_SOME(slave1);
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
 
   // Launch the first task with the default executor id.
   ExecutorInfo executor1;
@@ -1656,7 +1656,7 @@ TEST_F(TaskValidationTest, ExecutorInfoDiffersOnDifferentSlaves)
   driver.launchTasks(offers1.get()[0].id(), {task1});
 
   AWAIT_READY(status1);
-  ASSERT_EQ(TASK_RUNNING, status1.get().state());
+  ASSERT_EQ(TASK_RUNNING, status1->state());
 
   Future<vector<Offer>> offers2;
   EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -1672,7 +1672,7 @@ TEST_F(TaskValidationTest, ExecutorInfoDiffersOnDifferentSlaves)
   ASSERT_SOME(slave2);
 
   AWAIT_READY(offers2);
-  EXPECT_NE(0u, offers2.get().size());
+  EXPECT_NE(0u, offers2->size());
 
   // Now launch the second task with the same executor id but
   // a different executor command.
@@ -1695,7 +1695,7 @@ TEST_F(TaskValidationTest, ExecutorInfoDiffersOnDifferentSlaves)
   driver.launchTasks(offers2.get()[0].id(), {task2});
 
   AWAIT_READY(status2);
-  ASSERT_EQ(TASK_RUNNING, status2.get().state());
+  ASSERT_EQ(TASK_RUNNING, status2->state());
 
   EXPECT_CALL(exec1, shutdown(_))
     .Times(AtMost(1));
@@ -2140,7 +2140,7 @@ TEST_F(TaskValidationTest, TaskEnvironmentInvalid)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   Future<TaskStatus> status;
   EXPECT_CALL(sched, statusUpdate(&driver, _))
@@ -2156,7 +2156,7 @@ TEST_F(TaskValidationTest, TaskEnvironmentInvalid)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_ERROR, status.get().state());
+  EXPECT_EQ(TASK_ERROR, status->state());
   EXPECT_EQ(
       "Task's `CommandInfo` is invalid: Environment variable 'ENV_VAR_KEY' "
       "of type 'VALUE' must have a value set",
@@ -2670,7 +2670,7 @@ TEST_F(TaskGroupValidationTest, ExecutorWithoutFrameworkId)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Create an invalid executor without framework id.
   ExecutorInfo executor;
@@ -3034,7 +3034,7 @@ TEST_F(TaskGroupValidationTest, ExecutorEnvironmentInvalid)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task1;
   task1.set_name("1");
@@ -3138,7 +3138,7 @@ TEST_F(TaskGroupValidationTest, TaskEnvironmentInvalid)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task1;
   task1.set_name("1");
@@ -3672,8 +3672,8 @@ TEST_F(FrameworkInfoValidationTest, RoleChangeWithMultiRoleMasterFailover)
     driver.launchTasks(offers.get()[0].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());
 
     // Since we launched a task, stopping the driver will cause the
     // task and its executor to be shutdown.

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/metrics_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/metrics_tests.cpp b/src/tests/metrics_tests.cpp
index 27fc35f..a4d0e31 100644
--- a/src/tests/metrics_tests.cpp
+++ b/src/tests/metrics_tests.cpp
@@ -102,7 +102,7 @@ TEST_F(MetricsTest, Master)
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(process::http::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);
 
   JSON::Object stats = parse.get();
@@ -220,7 +220,7 @@ TEST_F(MetricsTest, Slave)
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(process::http::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);
 
   JSON::Object stats = parse.get();

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/oversubscription_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/oversubscription_tests.cpp b/src/tests/oversubscription_tests.cpp
index e57fcc6..25e2cdf 100644
--- a/src/tests/oversubscription_tests.cpp
+++ b/src/tests/oversubscription_tests.cpp
@@ -226,7 +226,7 @@ TEST_F(OversubscriptionTest, FetchResourceUsage)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(offers.get()[0], "sleep 10", DEFAULT_EXECUTOR_ID);
   task.mutable_labels()->add_labels()->CopyFrom(
@@ -247,7 +247,7 @@ TEST_F(OversubscriptionTest, FetchResourceUsage)
   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(usageCallback);
 
@@ -255,21 +255,21 @@ TEST_F(OversubscriptionTest, FetchResourceUsage)
   AWAIT_READY(usage);
 
   // Expecting the same statistics as these returned by mocked containerizer.
-  ASSERT_EQ(1, usage.get().executors_size());
-  EXPECT_EQ(usage.get().executors(0).executor_info().executor_id(),
+  ASSERT_EQ(1, usage->executors_size());
+  EXPECT_EQ(usage->executors(0).executor_info().executor_id(),
             DEFAULT_EXECUTOR_ID);
-  ASSERT_EQ(usage.get().executors(0).statistics(), statistics);
+  ASSERT_EQ(usage->executors(0).statistics(), statistics);
   ASSERT_EQ(task.executor().labels(),
-            usage.get().executors(0).executor_info().labels());
-  ASSERT_EQ(1, usage.get().executors(0).tasks().size());
+            usage->executors(0).executor_info().labels());
+  ASSERT_EQ(1, usage->executors(0).tasks().size());
   ASSERT_EQ(task.name(),
-            usage.get().executors(0).tasks(0).name());
+            usage->executors(0).tasks(0).name());
   ASSERT_EQ(task.task_id(),
-            usage.get().executors(0).tasks(0).id());
+            usage->executors(0).tasks(0).id());
   ASSERT_EQ(task.resources(),
-            usage.get().executors(0).tasks(0).resources());
+            usage->executors(0).tasks(0).resources());
   ASSERT_EQ(task.labels(),
-            usage.get().executors(0).tasks(0).labels());
+            usage->executors(0).tasks(0).labels());
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -323,7 +323,7 @@ TEST_F(OversubscriptionTest, ForwardUpdateSlaveMessage)
 
   AWAIT_READY(update);
 
-  EXPECT_EQ(update.get().oversubscribed_resources(), resources);
+  EXPECT_EQ(update->oversubscribed_resources(), resources);
 
   // Ensure the metric is updated.
   JSON::Object metrics = Metrics();
@@ -390,7 +390,7 @@ TEST_F(OversubscriptionTest, RevocableOffer)
 
   // Initially the framework will get all regular resources.
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
   EXPECT_TRUE(Resources(offers1.get()[0].resources()).revocable().empty());
 
   Future<vector<Offer>> offers2;
@@ -409,7 +409,7 @@ TEST_F(OversubscriptionTest, RevocableOffer)
 
   // Now the framework will get revocable resources.
   AWAIT_READY(offers2);
-  EXPECT_NE(0u, offers2.get().size());
+  EXPECT_NE(0u, offers2->size());
   EXPECT_EQ(
       taskResources + executorResources,
       Resources(offers2.get()[0].resources()));
@@ -433,7 +433,7 @@ TEST_F(OversubscriptionTest, RevocableOffer)
   driver.launchTasks({offers1.get()[0].id(), offers2.get()[0].id()}, {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -696,7 +696,7 @@ TEST_F(OversubscriptionTest, FixedResourceEstimator)
 
   AWAIT_READY(update);
 
-  Resources resources = update.get().oversubscribed_resources();
+  Resources resources = update->oversubscribed_resources();
   EXPECT_SOME_EQ(2.0, resources.cpus());
 
   Clock::resume();
@@ -727,7 +727,7 @@ TEST_F(OversubscriptionTest, FixedResourceEstimator)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
   const Offer offer = offers.get()[0];
 
   // The offer should contain revocable resources.
@@ -750,8 +750,8 @@ TEST_F(OversubscriptionTest, FixedResourceEstimator)
   driver.launchTasks(offer.id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(task.task_id(), status.get().task_id());
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(task.task_id(), status->task_id());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   // Advance the clock for the slave to trigger the calculation of the
   // total oversubscribed resources. As we described above, we don't
@@ -813,7 +813,7 @@ TEST_F(OversubscriptionTest, QoSFetchResourceUsage)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(offers.get()[0], "sleep 10", DEFAULT_EXECUTOR_ID);
   task.mutable_executor()->mutable_labels()->add_labels()->CopyFrom(
@@ -832,7 +832,7 @@ TEST_F(OversubscriptionTest, QoSFetchResourceUsage)
   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(usageCallback);
 
@@ -840,12 +840,12 @@ TEST_F(OversubscriptionTest, QoSFetchResourceUsage)
   AWAIT_READY(usage);
 
   // Expecting the same statistics as these returned by mocked containerizer.
-  ASSERT_EQ(1, usage.get().executors_size());
-  EXPECT_EQ(usage.get().executors(0).executor_info().executor_id(),
+  ASSERT_EQ(1, usage->executors_size());
+  EXPECT_EQ(usage->executors(0).executor_info().executor_id(),
             DEFAULT_EXECUTOR_ID);
-  ASSERT_EQ(usage.get().executors(0).statistics(), statistics);
+  ASSERT_EQ(usage->executors(0).statistics(), statistics);
   ASSERT_EQ(task.executor().labels(),
-            usage.get().executors(0).executor_info().labels());
+            usage->executors(0).executor_info().labels());
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -897,7 +897,7 @@ TEST_F(OversubscriptionTest, Reregistration)
   AWAIT_READY(slaveRegistered);
   AWAIT_READY(update);
 
-  Resources resources = update.get().oversubscribed_resources();
+  Resources resources = update->oversubscribed_resources();
   EXPECT_SOME_EQ(2.0, resources.cpus());
 
   // Trigger a re-registration and expect another update message.
@@ -945,7 +945,7 @@ TEST_F(OversubscriptionTest, ReceiveQoSCorrection)
 
   AWAIT_READY(qosCorrections);
 
-  ASSERT_EQ(qosCorrections.get().size(), 1u);
+  ASSERT_EQ(qosCorrections->size(), 1u);
 
   // TODO(nnielsen): Test for equality of QoSCorrections.
 
@@ -1007,7 +1007,7 @@ TEST_F(OversubscriptionTest, QoSCorrectionKill)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(offers.get()[0], "sleep 10");
 
@@ -1021,7 +1021,7 @@ TEST_F(OversubscriptionTest, QoSCorrectionKill)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status1);
-  ASSERT_EQ(TASK_RUNNING, status1.get().state());
+  ASSERT_EQ(TASK_RUNNING, status1->state());
 
   AWAIT_READY(usageCallback);
 
@@ -1029,9 +1029,9 @@ TEST_F(OversubscriptionTest, QoSCorrectionKill)
   AWAIT_READY(usage);
 
   // Expecting the same statistics as these returned by mocked containerizer.
-  ASSERT_EQ(1, usage.get().executors_size());
+  ASSERT_EQ(1, usage->executors_size());
 
-  const ResourceUsage::Executor& executor = usage.get().executors(0);
+  const ResourceUsage::Executor& executor = usage->executors(0);
   // Carry out kill correction.
   QoSCorrection killCorrection;
 
@@ -1116,7 +1116,7 @@ TEST_F(OversubscriptionTest, QoSCorrectionKillPartitionAware)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(offers.get()[0], "sleep 10");
 
@@ -1130,7 +1130,7 @@ TEST_F(OversubscriptionTest, QoSCorrectionKillPartitionAware)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status1);
-  ASSERT_EQ(TASK_RUNNING, status1.get().state());
+  ASSERT_EQ(TASK_RUNNING, status1->state());
 
   AWAIT_READY(usageCallback);
 
@@ -1138,9 +1138,9 @@ TEST_F(OversubscriptionTest, QoSCorrectionKillPartitionAware)
   AWAIT_READY(usage);
 
   // Expecting the same statistics as these returned by mocked containerizer.
-  ASSERT_EQ(1, usage.get().executors_size());
+  ASSERT_EQ(1, usage->executors_size());
 
-  const ResourceUsage::Executor& executor = usage.get().executors(0);
+  const ResourceUsage::Executor& executor = usage->executors(0);
   // Carry out kill correction.
   QoSCorrection killCorrection;
 
@@ -1226,7 +1226,7 @@ TEST_F(OversubscriptionTest, UpdateAllocatorOnSchedulerFailover)
   // it doesn't have the capability set.
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
   EXPECT_TRUE(Resources(offers1.get()[0].resources()).revocable().empty());
 
   // Now launch the second (i.e., failover) scheduler using the
@@ -1274,7 +1274,7 @@ TEST_F(OversubscriptionTest, UpdateAllocatorOnSchedulerFailover)
   Clock::resume();
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
   EXPECT_TRUE(Resources(offers1.get()[0].resources()).revocable().empty());
 
   // Check if framework receives revocable offers.
@@ -1286,7 +1286,7 @@ TEST_F(OversubscriptionTest, UpdateAllocatorOnSchedulerFailover)
   estimations.put(revocable);
 
   AWAIT_READY(offers2);
-  EXPECT_NE(0u, offers2.get().size());
+  EXPECT_NE(0u, offers2->size());
   EXPECT_EQ(allocatedResources(revocable, framework2.role()),
             Resources(offers2.get()[0].resources()));
 
@@ -1345,7 +1345,7 @@ TEST_F(OversubscriptionTest, RemoveCapabilitiesOnSchedulerFailover)
 
   // Initially the framework will get all regular resources.
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
   EXPECT_TRUE(Resources(offers1.get()[0].resources()).revocable().empty());
 
   Future<vector<Offer>> offers2;
@@ -1359,7 +1359,7 @@ TEST_F(OversubscriptionTest, RemoveCapabilitiesOnSchedulerFailover)
 
   // Now the framework will get revocable resources.
   AWAIT_READY(offers2);
-  EXPECT_NE(0u, offers2.get().size());
+  EXPECT_NE(0u, offers2->size());
   EXPECT_EQ(allocatedResources(revocable, framework1.role()),
             Resources(offers2.get()[0].resources()));
 
@@ -1396,7 +1396,7 @@ TEST_F(OversubscriptionTest, RemoveCapabilitiesOnSchedulerFailover)
   Clock::resume();
 
   AWAIT_READY(offers3);
-  EXPECT_NE(0u, offers3.get().size());
+  EXPECT_NE(0u, offers3->size());
   EXPECT_TRUE(Resources(offers3.get()[0].resources()).revocable().empty());
 
   driver1.stop();
@@ -1469,7 +1469,7 @@ TEST_F(OversubscriptionTest, LoadQoSController)
   AWAIT(qosCorrections);
 
   // Expect no corrections.
-  ASSERT_EQ(qosCorrections.get().size(), 0u);
+  ASSERT_EQ(qosCorrections->size(), 0u);
 
   // Second correction iteration. Make system 5 minutes load above the
   // threshold.
@@ -1479,7 +1479,7 @@ TEST_F(OversubscriptionTest, LoadQoSController)
   AWAIT(qosCorrections);
 
   // Expect two corrections, since there were two revocable executors.
-  ASSERT_EQ(qosCorrections.get().size(), 2u);
+  ASSERT_EQ(qosCorrections->size(), 2u);
 }
 
 


[5/8] mesos git commit: Replace `.get().` in favor of the `->` operator in tests.

Posted by bm...@apache.org.
http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/ldd_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/ldd_tests.cpp b/src/tests/ldd_tests.cpp
index 2352399..9a19b4c 100644
--- a/src/tests/ldd_tests.cpp
+++ b/src/tests/ldd_tests.cpp
@@ -45,11 +45,11 @@ TEST(Ldd, BinSh)
   Try<hashset<string>> dependencies = ldd("/bin/sh", cache.get());
   ASSERT_SOME(dependencies);
 
-  EXPECT_FALSE(dependencies.get().contains("/bin/sh"));
+  EXPECT_FALSE(dependencies->contains("/bin/sh"));
 
   auto libc = std::find_if(
-      dependencies.get().begin(),
-      dependencies.get().end(),
+      dependencies->begin(),
+      dependencies->end(),
       [](const string& dependency) {
         // On most Linux systems, libc would be in libc.so.6, but
         // checking the unversioned prefix is robust and is enough
@@ -58,7 +58,7 @@ TEST(Ldd, BinSh)
         return strings::startsWith(basename, "libc.so");
       });
 
-  EXPECT_TRUE(libc != dependencies.get().end());
+  EXPECT_TRUE(libc != dependencies->end());
 }
 
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/log_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/log_tests.cpp b/src/tests/log_tests.cpp
index 72182d3..52b1bfe 100644
--- a/src/tests/log_tests.cpp
+++ b/src/tests/log_tests.cpp
@@ -146,10 +146,10 @@ TYPED_TEST(LogStorageTest, Truncate)
   Try<Storage::State> state = storage.restore(os::getcwd() + "/.log");
   ASSERT_SOME(state);
 
-  EXPECT_EQ(Metadata::EMPTY, state.get().metadata.status());
-  EXPECT_EQ(0u, state.get().metadata.promised());
-  EXPECT_EQ(0u, state.get().begin);
-  EXPECT_EQ(0u, state.get().end);
+  EXPECT_EQ(Metadata::EMPTY, state->metadata.status());
+  EXPECT_EQ(0u, state->metadata.promised());
+  EXPECT_EQ(0u, state->begin);
+  EXPECT_EQ(0u, state->end);
 
   // Append from position 0 to position 9.
   for (uint64_t i = 0; i < 10; i++) {
@@ -168,13 +168,13 @@ TYPED_TEST(LogStorageTest, Truncate)
     Try<Action> action = storage.read(i);
     ASSERT_SOME(action);
 
-    EXPECT_EQ(i, action.get().position());
-    EXPECT_EQ(1u, action.get().promised());
-    EXPECT_EQ(1u, action.get().performed());
-    EXPECT_TRUE(action.get().learned());
-    EXPECT_EQ(Action::APPEND, action.get().type());
-    ASSERT_TRUE(action.get().has_append());
-    EXPECT_EQ(stringify(i), action.get().append().bytes());
+    EXPECT_EQ(i, action->position());
+    EXPECT_EQ(1u, action->promised());
+    EXPECT_EQ(1u, action->performed());
+    EXPECT_TRUE(action->learned());
+    EXPECT_EQ(Action::APPEND, action->type());
+    ASSERT_TRUE(action->has_append());
+    EXPECT_EQ(stringify(i), action->append().bytes());
   }
 
   // Truncate to position 3 (at position 10).
@@ -196,21 +196,21 @@ TYPED_TEST(LogStorageTest, Truncate)
       EXPECT_ERROR(action);
     } else if (i == 10) {
       // Position 10 is a truncate.
-      EXPECT_EQ(i, action.get().position());
-      EXPECT_EQ(1u, action.get().promised());
-      EXPECT_EQ(1u, action.get().performed());
-      EXPECT_TRUE(action.get().learned());
-      EXPECT_EQ(Action::TRUNCATE, action.get().type());
-      ASSERT_TRUE(action.get().has_truncate());
-      EXPECT_EQ(3u, action.get().truncate().to());
+      EXPECT_EQ(i, action->position());
+      EXPECT_EQ(1u, action->promised());
+      EXPECT_EQ(1u, action->performed());
+      EXPECT_TRUE(action->learned());
+      EXPECT_EQ(Action::TRUNCATE, action->type());
+      ASSERT_TRUE(action->has_truncate());
+      EXPECT_EQ(3u, action->truncate().to());
     } else {
-      EXPECT_EQ(i, action.get().position());
-      EXPECT_EQ(1u, action.get().promised());
-      EXPECT_EQ(1u, action.get().performed());
-      EXPECT_TRUE(action.get().learned());
-      EXPECT_EQ(Action::APPEND, action.get().type());
-      ASSERT_TRUE(action.get().has_append());
-      EXPECT_EQ(stringify(i), action.get().append().bytes());
+      EXPECT_EQ(i, action->position());
+      EXPECT_EQ(1u, action->promised());
+      EXPECT_EQ(1u, action->performed());
+      EXPECT_TRUE(action->learned());
+      EXPECT_EQ(Action::APPEND, action->type());
+      ASSERT_TRUE(action->has_append());
+      EXPECT_EQ(stringify(i), action->append().bytes());
     }
   }
 
@@ -232,22 +232,22 @@ TYPED_TEST(LogStorageTest, Truncate)
       EXPECT_ERROR(action);
     } else if (i == 10) {
       // Position 10 is a truncate (to position 3).
-      EXPECT_EQ(i, action.get().position());
-      EXPECT_EQ(1u, action.get().promised());
-      EXPECT_EQ(1u, action.get().performed());
-      EXPECT_TRUE(action.get().learned());
-      EXPECT_EQ(Action::TRUNCATE, action.get().type());
-      ASSERT_TRUE(action.get().has_truncate());
-      EXPECT_EQ(3u, action.get().truncate().to());
+      EXPECT_EQ(i, action->position());
+      EXPECT_EQ(1u, action->promised());
+      EXPECT_EQ(1u, action->performed());
+      EXPECT_TRUE(action->learned());
+      EXPECT_EQ(Action::TRUNCATE, action->type());
+      ASSERT_TRUE(action->has_truncate());
+      EXPECT_EQ(3u, action->truncate().to());
     } else if (i == 11) {
       // Position 11 is a truncate (to position 10).
-      EXPECT_EQ(i, action.get().position());
-      EXPECT_EQ(1u, action.get().promised());
-      EXPECT_EQ(1u, action.get().performed());
-      EXPECT_TRUE(action.get().learned());
-      EXPECT_EQ(Action::TRUNCATE, action.get().type());
-      ASSERT_TRUE(action.get().has_truncate());
-      EXPECT_EQ(10u, action.get().truncate().to());
+      EXPECT_EQ(i, action->position());
+      EXPECT_EQ(1u, action->promised());
+      EXPECT_EQ(1u, action->performed());
+      EXPECT_TRUE(action->learned());
+      EXPECT_EQ(Action::TRUNCATE, action->type());
+      ASSERT_TRUE(action->has_truncate());
+      EXPECT_EQ(10u, action->truncate().to());
     }
   }
 }
@@ -274,13 +274,13 @@ TYPED_TEST(LogStorageTest, TruncateWithEmptyLog)
   EXPECT_ERROR(action0);
 
   Try<Action> action1 = storage.read(1);
-  EXPECT_EQ(1u, action1.get().position());
-  EXPECT_EQ(1u, action1.get().promised());
-  EXPECT_EQ(1u, action1.get().performed());
-  EXPECT_TRUE(action1.get().learned());
-  EXPECT_EQ(Action::TRUNCATE, action1.get().type());
-  ASSERT_TRUE(action1.get().has_truncate());
-  EXPECT_EQ(0u, action1.get().truncate().to());
+  EXPECT_EQ(1u, action1->position());
+  EXPECT_EQ(1u, action1->promised());
+  EXPECT_EQ(1u, action1->performed());
+  EXPECT_TRUE(action1->learned());
+  EXPECT_EQ(Action::TRUNCATE, action1->type());
+  ASSERT_TRUE(action1->has_truncate());
+  EXPECT_EQ(0u, action1->truncate().to());
 }
 
 
@@ -311,13 +311,13 @@ TYPED_TEST(LogStorageTest, TruncateWithManyHoles)
 
   Try<Action> action = storage.read(600020000);
 
-  EXPECT_EQ(600020000u, action.get().position());
-  EXPECT_EQ(1u, action.get().promised());
-  EXPECT_EQ(1u, action.get().performed());
-  EXPECT_TRUE(action.get().learned());
-  EXPECT_EQ(Action::TRUNCATE, action.get().type());
-  ASSERT_TRUE(action.get().has_truncate());
-  EXPECT_EQ(600000000u, action.get().truncate().to());
+  EXPECT_EQ(600020000u, action->position());
+  EXPECT_EQ(1u, action->promised());
+  EXPECT_EQ(1u, action->performed());
+  EXPECT_TRUE(action->learned());
+  EXPECT_EQ(Action::TRUNCATE, action->type());
+  ASSERT_TRUE(action->has_truncate());
+  EXPECT_EQ(600000000u, action->truncate().to());
 }
 
 
@@ -423,9 +423,9 @@ TEST_F(ReplicaTest, Append)
   Future<list<Action>> actions = replica.read(1, 1);
 
   AWAIT_READY(actions);
-  ASSERT_EQ(1u, actions.get().size());
+  ASSERT_EQ(1u, actions->size());
 
-  Action action = actions.get().front();
+  Action action = actions->front();
   EXPECT_EQ(1u, action.position());
   EXPECT_EQ(1u, action.promised());
   EXPECT_TRUE(action.has_performed());
@@ -686,7 +686,7 @@ TEST_F(CoordinatorTest, AppendRead)
     Future<Option<uint64_t>> appending = coord.append("hello world");
     AWAIT_READY(appending);
     ASSERT_SOME(appending.get());
-    position = appending.get().get();
+    position = appending->get();
     EXPECT_EQ(1u, position);
   }
 
@@ -735,7 +735,7 @@ TEST_F(CoordinatorTest, AppendReadError)
     Future<Option<uint64_t>> appending = coord.append("hello world");
     AWAIT_READY(appending);
     ASSERT_SOME(appending.get());
-    position = appending.get().get();
+    position = appending->get();
     EXPECT_EQ(1u, position);
   }
 
@@ -773,7 +773,7 @@ TEST_F(CoordinatorTest, AppendDiscarded)
     Future<Option<uint64_t>> electing = coord.elect();
     AWAIT_READY(electing);
     ASSERT_SOME(electing.get());
-    EXPECT_EQ(0u, electing.get().get());
+    EXPECT_EQ(0u, electing->get());
   }
 
   process::terminate(replica2->pid());
@@ -902,7 +902,7 @@ TEST_F(CoordinatorTest, Failover)
     Future<Option<uint64_t>> appending = coord1.append("hello world");
     AWAIT_READY(appending);
     ASSERT_SOME(appending.get());
-    position = appending.get().get();
+    position = appending->get();
     EXPECT_EQ(1u, position);
   }
 
@@ -961,7 +961,7 @@ TEST_F(CoordinatorTest, Demoted)
     Future<Option<uint64_t>> appending = coord1.append("hello world");
     AWAIT_READY(appending);
     ASSERT_SOME(appending.get());
-    position1 = appending.get().get();
+    position1 = appending->get();
     EXPECT_EQ(1u, position1);
   }
 
@@ -987,7 +987,7 @@ TEST_F(CoordinatorTest, Demoted)
     Future<Option<uint64_t>> appending = coord2.append("hello hello");
     AWAIT_READY(appending);
     ASSERT_SOME(appending.get());
-    position2 = appending.get().get();
+    position2 = appending->get();
     EXPECT_EQ(2u, position2);
   }
 
@@ -1040,7 +1040,7 @@ TEST_F(CoordinatorTest, Fill)
     Future<Option<uint64_t>> appending = coord1.append("hello world");
     AWAIT_READY(appending);
     ASSERT_SOME(appending.get());
-    position = appending.get().get();
+    position = appending->get();
     EXPECT_EQ(1u, position);
   }
 
@@ -1120,7 +1120,7 @@ TEST_F(CoordinatorTest, NotLearnedFill)
     Future<Option<uint64_t>> appending = coord1.append("hello world");
     AWAIT_READY(appending);
     ASSERT_SOME(appending.get());
-    position = appending.get().get();
+    position = appending->get();
     EXPECT_EQ(1u, position);
   }
 
@@ -2032,13 +2032,13 @@ TEST_F(LogTest, WriteRead)
   Log::Reader reader(&log);
 
   Future<list<Log::Entry>> entries =
-    reader.read(position.get().get(), position.get().get());
+    reader.read(position->get(), position->get());
 
   AWAIT_READY(entries);
 
-  ASSERT_EQ(1u, entries.get().size());
-  EXPECT_EQ(position.get().get(), entries.get().front().position);
-  EXPECT_EQ("hello world", entries.get().front().data);
+  ASSERT_EQ(1u, entries->size());
+  EXPECT_EQ(position->get(), entries->front().position);
+  EXPECT_EQ("hello world", entries->front().data);
 }
 
 
@@ -2072,8 +2072,8 @@ TEST_F(LogTest, Position)
   ASSERT_SOME(position.get());
 
   ASSERT_EQ(
-      position.get().get(),
-      log.position(position.get().get().identity()));
+      position->get(),
+      log.position(position->get().identity()));
 }
 
 
@@ -2182,13 +2182,13 @@ TEST_F(LogZooKeeperTest, WriteRead)
   Log::Reader reader(&log2);
 
   Future<list<Log::Entry>> entries =
-    reader.read(position.get().get(), position.get().get());
+    reader.read(position->get(), position->get());
 
   AWAIT_READY(entries);
 
-  ASSERT_EQ(1u, entries.get().size());
-  EXPECT_EQ(position.get().get(), entries.get().front().position);
-  EXPECT_EQ("hello world", entries.get().front().data);
+  ASSERT_EQ(1u, entries->size());
+  EXPECT_EQ(position->get(), entries->front().position);
+  EXPECT_EQ("hello world", entries->front().data);
 }
 
 
@@ -2220,13 +2220,13 @@ TEST_F(LogZooKeeperTest, LostZooKeeper)
   Log::Reader reader(&log);
 
   Future<list<Log::Entry>> entries =
-    reader.read(position.get().get(), position.get().get());
+    reader.read(position->get(), position->get());
 
   AWAIT_READY(entries);
 
-  ASSERT_EQ(1u, entries.get().size());
-  EXPECT_EQ(position.get().get(), entries.get().front().position);
-  EXPECT_EQ("hello world", entries.get().front().data);
+  ASSERT_EQ(1u, entries->size());
+  EXPECT_EQ(position->get(), entries->front().position);
+  EXPECT_EQ("hello world", entries->front().data);
 }
 #endif // MESOS_HAS_JAVA
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/master_allocator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_allocator_tests.cpp b/src/tests/master_allocator_tests.cpp
index 0fb66e4..9f37502 100644
--- a/src/tests/master_allocator_tests.cpp
+++ b/src/tests/master_allocator_tests.cpp
@@ -1392,7 +1392,7 @@ TYPED_TEST(MasterAllocatorTest, FrameworkReregistersFirst)
 
     AWAIT_READY(status);
 
-    EXPECT_EQ(TASK_RUNNING, status.get().state());
+    EXPECT_EQ(TASK_RUNNING, status->state());
 
     // Make sure the slave handles status update acknowledgement so
     // that it doesn't try to retry the update after master failover.
@@ -1515,7 +1515,7 @@ TYPED_TEST(MasterAllocatorTest, SlaveReregistersFirst)
 
     AWAIT_READY(status);
 
-    EXPECT_EQ(TASK_RUNNING, status.get().state());
+    EXPECT_EQ(TASK_RUNNING, status->state());
 
     // Make sure the slave handles status update acknowledgement so
     // that it doesn't try to retry the update after master failover.
@@ -1657,7 +1657,7 @@ TYPED_TEST(MasterAllocatorTest, RebalancedForUpdatedWeights)
   AWAIT_READY(registered1);
   AWAIT_READY(framework1offers1);
 
-  ASSERT_EQ(3u, framework1offers1.get().size());
+  ASSERT_EQ(3u, framework1offers1->size());
   for (int i = 0; i < 3; i++) {
     EXPECT_EQ(Resources(framework1offers1.get()[i].resources()),
               allocatedResources(agentResources, "role1"));
@@ -1717,7 +1717,7 @@ TYPED_TEST(MasterAllocatorTest, RebalancedForUpdatedWeights)
           strings::format("%s", JSON::protobuf(infos)).get()));
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-    << response.get().body;
+    << response->body;
 
   // 'updateWeights' will rescind all outstanding offers and the rescinded
   // offer resources will only be available to the updated weights once
@@ -1759,7 +1759,7 @@ TYPED_TEST(MasterAllocatorTest, RebalancedForUpdatedWeights)
   //   framework2 share = 1
 
   AWAIT_READY(framework1offers2);
-  ASSERT_EQ(1u, framework1offers2.get().size());
+  ASSERT_EQ(1u, framework1offers2->size());
   EXPECT_EQ(Resources(framework1offers2.get()[0].resources()),
             allocatedResources(agentResources, "role1"));
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/master_authorization_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_authorization_tests.cpp b/src/tests/master_authorization_tests.cpp
index 94107d0..1a0285a 100644
--- a/src/tests/master_authorization_tests.cpp
+++ b/src/tests/master_authorization_tests.cpp
@@ -132,7 +132,7 @@ TEST_F(MasterAuthorizationTest, AuthorizedTask)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Create an authorized task.
   TaskInfo task;
@@ -154,7 +154,7 @@ TEST_F(MasterAuthorizationTest, AuthorizedTask)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -204,7 +204,7 @@ TEST_F(MasterAuthorizationTest, UnauthorizedTask)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // Create an unauthorized task.
   TaskInfo task;
@@ -221,8 +221,8 @@ TEST_F(MasterAuthorizationTest, UnauthorizedTask)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_ERROR, status.get().state());
-  EXPECT_EQ(TaskStatus::REASON_TASK_UNAUTHORIZED, status.get().reason());
+  EXPECT_EQ(TASK_ERROR, status->state());
+  EXPECT_EQ(TaskStatus::REASON_TASK_UNAUTHORIZED, status->reason());
 
   // Make sure the task is not known to master anymore.
   EXPECT_CALL(sched, statusUpdate(&driver, _))
@@ -278,7 +278,7 @@ TEST_F(MasterAuthorizationTest, UnauthorizedTaskGroup)
   AWAIT_READY(frameworkId);
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   Resources resources =
     Resources::parse("cpus:0.1;mem:32;disk:32").get();
@@ -379,7 +379,7 @@ TEST_F(MasterAuthorizationTest, KillTask)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(offers.get()[0], "", DEFAULT_EXECUTOR_ID);
 
@@ -404,7 +404,7 @@ TEST_F(MasterAuthorizationTest, KillTask)
 
   // Framework should get a TASK_KILLED right away.
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_KILLED, status.get().state());
+  EXPECT_EQ(TASK_KILLED, status->state());
 
   Future<Nothing> recoverResources =
     FUTURE_DISPATCH(_, &MesosAllocatorProcess::recoverResources);
@@ -592,7 +592,7 @@ TEST_F(MasterAuthorizationTest, SlaveRemovedLost)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(offers.get()[0], "", DEFAULT_EXECUTOR_ID);
 
@@ -632,9 +632,9 @@ TEST_F(MasterAuthorizationTest, SlaveRemovedLost)
   // Framework should get a TASK_LOST.
   AWAIT_READY(status);
 
-  EXPECT_EQ(TASK_LOST, status.get().state());
-  EXPECT_EQ(TaskStatus::SOURCE_MASTER, status.get().source());
-  EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, status.get().reason());
+  EXPECT_EQ(TASK_LOST, status->state());
+  EXPECT_EQ(TaskStatus::SOURCE_MASTER, status->source());
+  EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, status->reason());
 
   // No task launch should happen resulting in all resources being
   // returned to the allocator.
@@ -697,7 +697,7 @@ TEST_F(MasterAuthorizationTest, SlaveRemovedDropped)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(offers.get()[0], "", DEFAULT_EXECUTOR_ID);
 
@@ -737,9 +737,9 @@ TEST_F(MasterAuthorizationTest, SlaveRemovedDropped)
   // Framework should get a TASK_DROPPED.
   AWAIT_READY(status);
 
-  EXPECT_EQ(TASK_DROPPED, status.get().state());
-  EXPECT_EQ(TaskStatus::SOURCE_MASTER, status.get().source());
-  EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, status.get().reason());
+  EXPECT_EQ(TASK_DROPPED, status->state());
+  EXPECT_EQ(TaskStatus::SOURCE_MASTER, status->source());
+  EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, status->reason());
 
   // No task launch should happen resulting in all resources being
   // returned to the allocator.
@@ -798,7 +798,7 @@ TEST_F(MasterAuthorizationTest, FrameworkRemoved)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task = createTask(offers.get()[0], "", DEFAULT_EXECUTOR_ID);
 
@@ -870,7 +870,7 @@ TEST_F(MasterAuthorizationTest, PendingExecutorInfoDiffersOnDifferentSlaves)
   ASSERT_SOME(slave1);
 
   AWAIT_READY(offers1);
-  EXPECT_NE(0u, offers1.get().size());
+  EXPECT_NE(0u, offers1->size());
 
   // Launch the first task with the default executor id.
   ExecutorInfo executor1;
@@ -906,7 +906,7 @@ TEST_F(MasterAuthorizationTest, PendingExecutorInfoDiffersOnDifferentSlaves)
   ASSERT_SOME(slave2);
 
   AWAIT_READY(offers2);
-  EXPECT_NE(0u, offers2.get().size());
+  EXPECT_NE(0u, offers2->size());
 
   // Now launch the second task with the same executor id but
   // a different executor command.
@@ -932,7 +932,7 @@ TEST_F(MasterAuthorizationTest, PendingExecutorInfoDiffersOnDifferentSlaves)
   driver.launchTasks(offers2.get()[0].id(), {task2});
 
   AWAIT_READY(status2);
-  ASSERT_EQ(TASK_RUNNING, status2.get().state());
+  ASSERT_EQ(TASK_RUNNING, status2->state());
 
   EXPECT_CALL(exec1, registered(_, _, _, _));
 
@@ -947,7 +947,7 @@ TEST_F(MasterAuthorizationTest, PendingExecutorInfoDiffersOnDifferentSlaves)
   promise.set(true);
 
   AWAIT_READY(status1);
-  ASSERT_EQ(TASK_RUNNING, status1.get().state());
+  ASSERT_EQ(TASK_RUNNING, status1->state());
 
   EXPECT_CALL(exec1, shutdown(_))
     .Times(AtMost(1));
@@ -1379,9 +1379,9 @@ TYPED_TEST(MasterAuthorizerTest, FilterStateSummaryEndpoint)
         createBasicAuthHeaders(DEFAULT_CREDENTIAL));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-      << response.get().body;
+      << response->body;
 
-    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
+    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
     ASSERT_SOME(parse);
 
     JSON::Object stateSummary = parse.get();
@@ -1400,9 +1400,9 @@ TYPED_TEST(MasterAuthorizerTest, FilterStateSummaryEndpoint)
         createBasicAuthHeaders(DEFAULT_CREDENTIAL_2));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-      << response.get().body;
+      << response->body;
 
-    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
+    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
     ASSERT_SOME(parse);
 
     JSON::Object stateSummary = parse.get();
@@ -1525,7 +1525,7 @@ TYPED_TEST(MasterAuthorizerTest, FilterStateEndpoint)
   AWAIT_READY(registered);
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("test");
@@ -1545,7 +1545,7 @@ TYPED_TEST(MasterAuthorizerTest, FilterStateEndpoint)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   // Retrieve endpoint with the user allowed to view the framework.
   {
@@ -1556,9 +1556,9 @@ TYPED_TEST(MasterAuthorizerTest, FilterStateEndpoint)
         createBasicAuthHeaders(DEFAULT_CREDENTIAL));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-      << response.get().body;
+      << response->body;
 
-    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
+    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
     ASSERT_SOME(parse);
 
     JSON::Object state = parse.get();
@@ -1585,9 +1585,9 @@ TYPED_TEST(MasterAuthorizerTest, FilterStateEndpoint)
         createBasicAuthHeaders(DEFAULT_CREDENTIAL_2));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-      << response.get().body;
+      << response->body;
 
-    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
+    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
     ASSERT_SOME(parse);
 
     JSON::Object state = parse.get();
@@ -1714,7 +1714,7 @@ TYPED_TEST(MasterAuthorizerTest, FilterFrameworksEndpoint)
   AWAIT_READY(registered);
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("test");
@@ -1734,7 +1734,7 @@ TYPED_TEST(MasterAuthorizerTest, FilterFrameworksEndpoint)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   // Retrieve endpoint with the user allowed to view the framework.
   {
@@ -1745,9 +1745,9 @@ TYPED_TEST(MasterAuthorizerTest, FilterFrameworksEndpoint)
         createBasicAuthHeaders(DEFAULT_CREDENTIAL));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-      << response.get().body;
+      << response->body;
 
-    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
+    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
     ASSERT_SOME(parse);
 
     JSON::Object state = parse.get();
@@ -1774,9 +1774,9 @@ TYPED_TEST(MasterAuthorizerTest, FilterFrameworksEndpoint)
         createBasicAuthHeaders(DEFAULT_CREDENTIAL_2));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-      << response.get().body;
+      << response->body;
 
-    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
+    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
     ASSERT_SOME(parse);
 
     JSON::Object state = parse.get();
@@ -1905,7 +1905,7 @@ TYPED_TEST(MasterAuthorizerTest, FilterTasksEndpoint)
   AWAIT_READY(registered);
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("test");
@@ -1925,7 +1925,7 @@ TYPED_TEST(MasterAuthorizerTest, FilterTasksEndpoint)
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   // Retrieve endpoint with the user allowed to view the framework.
   {
@@ -1936,9 +1936,9 @@ TYPED_TEST(MasterAuthorizerTest, FilterTasksEndpoint)
         createBasicAuthHeaders(DEFAULT_CREDENTIAL));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-      << response.get().body;
+      << response->body;
 
-    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
+    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
     ASSERT_SOME(parse);
 
     JSON::Object tasks = parse.get();
@@ -1956,9 +1956,9 @@ TYPED_TEST(MasterAuthorizerTest, FilterTasksEndpoint)
         createBasicAuthHeaders(DEFAULT_CREDENTIAL_2));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-      << response.get().body;
+      << response->body;
 
-    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
+    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
     ASSERT_SOME(parse);
 
     JSON::Object tasks = parse.get();
@@ -2009,7 +2009,7 @@ TYPED_TEST(MasterAuthorizerTest, ViewFlags)
         createBasicAuthHeaders(DEFAULT_CREDENTIAL));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-        << response.get().body;
+        << response->body;
 
     response = http::get(
         master.get()->pid,
@@ -2018,9 +2018,9 @@ TYPED_TEST(MasterAuthorizerTest, ViewFlags)
         createBasicAuthHeaders(DEFAULT_CREDENTIAL));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-        << response.get().body;
+        << response->body;
 
-    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
+    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
     ASSERT_SOME(parse);
     JSON::Object state = parse.get();
 
@@ -2038,7 +2038,7 @@ TYPED_TEST(MasterAuthorizerTest, ViewFlags)
         createBasicAuthHeaders(DEFAULT_CREDENTIAL_2));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(Forbidden().status, response)
-        << response.get().body;
+        << response->body;
 
     response = http::get(
         master.get()->pid,
@@ -2047,9 +2047,9 @@ TYPED_TEST(MasterAuthorizerTest, ViewFlags)
         createBasicAuthHeaders(DEFAULT_CREDENTIAL_2));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-        << response.get().body;
+        << response->body;
 
-    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
+    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
     ASSERT_SOME(parse);
     JSON::Object state = parse.get();
 
@@ -2106,9 +2106,9 @@ TYPED_TEST(MasterAuthorizerTest, FilterRolesEndpoint)
         createBasicAuthHeaders(DEFAULT_CREDENTIAL));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-      << response.get().body;
+      << response->body;
 
-    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
+    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
     ASSERT_SOME(parse);
 
     JSON::Object tasks = parse.get();
@@ -2125,9 +2125,9 @@ TYPED_TEST(MasterAuthorizerTest, FilterRolesEndpoint)
         createBasicAuthHeaders(DEFAULT_CREDENTIAL_2));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-      << response.get().body;
+      << response->body;
 
-    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
+    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
     ASSERT_SOME(parse);
 
     JSON::Object tasks = parse.get();
@@ -2266,9 +2266,9 @@ TYPED_TEST(MasterAuthorizerTest, FilterOrphanedTasks)
         createBasicAuthHeaders(DEFAULT_CREDENTIAL));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-      << response.get().body;
+      << response->body;
 
-    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
+    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
     ASSERT_SOME(parse);
 
     JSON::Object tasks = parse.get();
@@ -2296,9 +2296,9 @@ TYPED_TEST(MasterAuthorizerTest, FilterOrphanedTasks)
         createBasicAuthHeaders(DEFAULT_CREDENTIAL_2));
 
     AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response)
-      << response.get().body;
+      << response->body;
 
-    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
+    Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
     ASSERT_SOME(parse);
 
     JSON::Object tasks = parse.get();

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/master_contender_detector_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_contender_detector_tests.cpp b/src/tests/master_contender_detector_tests.cpp
index 2849471..c8c1ea0 100644
--- a/src/tests/master_contender_detector_tests.cpp
+++ b/src/tests/master_contender_detector_tests.cpp
@@ -206,7 +206,7 @@ TEST(BasicMasterContenderDetectorTest, MasterInfo)
 
   AWAIT_READY(detected);
   ASSERT_SOME(detected.get());
-  const MasterInfo& info = detected.get().get();
+  const MasterInfo& info = detected->get();
 
   ASSERT_TRUE(info.has_address());
   EXPECT_EQ("10.10.1.105", info.address().ip());
@@ -271,7 +271,7 @@ TEST_F(ZooKeeperMasterContenderDetectorTest, MasterContender)
 
   Future<Option<int64_t>> sessionId = group.get()->session();
   AWAIT_READY(sessionId);
-  server->expireSession(sessionId.get().get());
+  server->expireSession(sessionId->get());
 
   AWAIT_READY(lostCandidacy);
   AWAIT_READY(leader);
@@ -713,9 +713,9 @@ TEST_F(ZooKeeperMasterContenderDetectorTest,
   AWAIT_READY(session);
   EXPECT_SOME(session.get());
 
-  LOG(INFO) << "Now expire the ZK session: " << std::hex << session.get().get();
+  LOG(INFO) << "Now expire the ZK session: " << std::hex << session->get();
 
-  server->expireSession(session.get().get());
+  server->expireSession(session->get());
 
   AWAIT_READY(leaderLostLeadership);
 
@@ -723,7 +723,7 @@ TEST_F(ZooKeeperMasterContenderDetectorTest,
   // a new leader.
   AWAIT_READY(newLeaderDetected);
   EXPECT_SOME(newLeaderDetected.get());
-  EXPECT_EQ(follower, newLeaderDetected.get().get());
+  EXPECT_EQ(follower, newLeaderDetected->get());
 }
 
 
@@ -766,7 +766,7 @@ TEST_F(ZooKeeperMasterContenderDetectorTest, MasterDetectorExpireSlaveZKSession)
   Future<Option<int64_t>> session = group->session();
   AWAIT_READY(session);
 
-  server->expireSession(session.get().get());
+  server->expireSession(session->get());
 
   // Session expiration causes detector to assume all membership are
   // lost.
@@ -855,8 +855,8 @@ TEST_F(ZooKeeperMasterContenderDetectorTest,
   Future<Option<int64_t>> masterSession = leaderGroup->session();
   AWAIT_READY(masterSession);
 
-  server->expireSession(slaveSession.get().get());
-  server->expireSession(masterSession.get().get());
+  server->expireSession(slaveSession->get());
+  server->expireSession(masterSession->get());
 
   // Wait for session expiration and the detector will first receive
   // a "no master detected" event.

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/master_maintenance_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_maintenance_tests.cpp b/src/tests/master_maintenance_tests.cpp
index 237dc03..9edd74a 100644
--- a/src/tests/master_maintenance_tests.cpp
+++ b/src/tests/master_maintenance_tests.cpp
@@ -186,18 +186,18 @@ TEST_F(MasterMaintenanceTest, UpdateSchedule)
 
   // Check that the schedule was saved.
   Try<JSON::Object> masterSchedule_ =
-    JSON::parse<JSON::Object>(response.get().body);
+    JSON::parse<JSON::Object>(response->body);
 
   ASSERT_SOME(masterSchedule_);
   Try<mesos::maintenance::Schedule> masterSchedule =
     ::protobuf::parse<mesos::maintenance::Schedule>(masterSchedule_.get());
 
   ASSERT_SOME(masterSchedule);
-  ASSERT_EQ(1, masterSchedule.get().windows().size());
-  ASSERT_EQ(1, masterSchedule.get().windows(0).machine_ids().size());
+  ASSERT_EQ(1, masterSchedule->windows().size());
+  ASSERT_EQ(1, masterSchedule->windows(0).machine_ids().size());
   ASSERT_EQ(
       "Machine1",
-      masterSchedule.get().windows(0).machine_ids(0).hostname());
+      masterSchedule->windows(0).machine_ids(0).hostname());
 
   // Try to replace with an invalid schedule with an empty window.
   schedule = createSchedule(
@@ -515,7 +515,7 @@ TEST_F(MasterMaintenanceTest, PreV1SchedulerSupport)
 
   // Wait for some normal offers.
   AWAIT_READY(normalOffers);
-  EXPECT_NE(0u, normalOffers.get().size());
+  EXPECT_NE(0u, normalOffers->size());
 
   // Check that unavailability is not set.
   foreach (const Offer& offer, normalOffers.get()) {
@@ -550,7 +550,7 @@ TEST_F(MasterMaintenanceTest, PreV1SchedulerSupport)
 
   // Wait for some offers.
   AWAIT_READY(unavailabilityOffers);
-  EXPECT_NE(0u, unavailabilityOffers.get().size());
+  EXPECT_NE(0u, unavailabilityOffers->size());
 
   // Check that each offer has an unavailability.
   foreach (const Offer& offer, unavailabilityOffers.get()) {
@@ -615,7 +615,7 @@ TEST_F(MasterMaintenanceTest, EnterMaintenanceMode)
 
   // Wait till the task is running to schedule the maintenance.
   AWAIT_READY(startStatus);
-  EXPECT_EQ(TASK_RUNNING, startStatus.get().state());
+  EXPECT_EQ(TASK_RUNNING, startStatus->state());
 
   // Schedule this slave for maintenance.
   MachineID machine;
@@ -669,9 +669,9 @@ TEST_F(MasterMaintenanceTest, EnterMaintenanceMode)
   // Verify that we received a TASK_LOST.
   AWAIT_READY(lostStatus);
 
-  EXPECT_EQ(TASK_LOST, lostStatus.get().state());
-  EXPECT_EQ(TaskStatus::SOURCE_MASTER, lostStatus.get().source());
-  EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, lostStatus.get().reason());
+  EXPECT_EQ(TASK_LOST, lostStatus->state());
+  EXPECT_EQ(TaskStatus::SOURCE_MASTER, lostStatus->source());
+  EXPECT_EQ(TaskStatus::REASON_SLAVE_REMOVED, lostStatus->reason());
 
   // Verify that the framework received the slave lost message.
   AWAIT_READY(slaveLost);
@@ -889,15 +889,15 @@ TEST_F(MasterMaintenanceTest, BringUpMachines)
 
   // Check that only one maintenance window remains.
   Try<JSON::Object> masterSchedule_ =
-    JSON::parse<JSON::Object>(response.get().body);
+    JSON::parse<JSON::Object>(response->body);
 
   ASSERT_SOME(masterSchedule_);
   Try<mesos::maintenance::Schedule> masterSchedule =
     ::protobuf::parse<mesos::maintenance::Schedule>(masterSchedule_.get());
 
   ASSERT_SOME(masterSchedule);
-  ASSERT_EQ(1, masterSchedule.get().windows().size());
-  ASSERT_EQ(2, masterSchedule.get().windows(0).machine_ids().size());
+  ASSERT_EQ(1, masterSchedule->windows().size());
+  ASSERT_EQ(2, masterSchedule->windows(0).machine_ids().size());
 
   // Down the other machines.
   machines = createMachineList({machine1, machine2});
@@ -928,14 +928,14 @@ TEST_F(MasterMaintenanceTest, BringUpMachines)
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
 
   // Check that the schedule is empty.
-  masterSchedule_ = JSON::parse<JSON::Object>(response.get().body);
+  masterSchedule_ = JSON::parse<JSON::Object>(response->body);
 
   ASSERT_SOME(masterSchedule_);
   masterSchedule =
     ::protobuf::parse<mesos::maintenance::Schedule>(masterSchedule_.get());
 
   ASSERT_SOME(masterSchedule);
-  ASSERT_EQ(0, masterSchedule.get().windows().size());
+  ASSERT_EQ(0, masterSchedule->windows().size());
 }
 
 
@@ -969,15 +969,15 @@ TEST_F(MasterMaintenanceTest, MachineStatus)
 
   // Check that both machines are draining.
   Try<JSON::Object> statuses_ =
-    JSON::parse<JSON::Object>(response.get().body);
+    JSON::parse<JSON::Object>(response->body);
 
   ASSERT_SOME(statuses_);
   Try<maintenance::ClusterStatus> statuses =
     ::protobuf::parse<maintenance::ClusterStatus>(statuses_.get());
 
   ASSERT_SOME(statuses);
-  ASSERT_EQ(2, statuses.get().draining_machines().size());
-  ASSERT_EQ(0, statuses.get().down_machines().size());
+  ASSERT_EQ(2, statuses->draining_machines().size());
+  ASSERT_EQ(0, statuses->down_machines().size());
 
   // Deactivate machine1.
   JSON::Array machines = createMachineList({machine1});
@@ -999,15 +999,15 @@ TEST_F(MasterMaintenanceTest, MachineStatus)
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
 
   // Check one machine is deactivated.
-  statuses_ = JSON::parse<JSON::Object>(response.get().body);
+  statuses_ = JSON::parse<JSON::Object>(response->body);
 
   ASSERT_SOME(statuses_);
   statuses = ::protobuf::parse<maintenance::ClusterStatus>(statuses_.get());
 
   ASSERT_SOME(statuses);
-  ASSERT_EQ(1, statuses.get().draining_machines().size());
-  ASSERT_EQ(1, statuses.get().down_machines().size());
-  ASSERT_EQ("Machine1", statuses.get().down_machines(0).hostname());
+  ASSERT_EQ(1, statuses->draining_machines().size());
+  ASSERT_EQ(1, statuses->down_machines().size());
+  ASSERT_EQ("Machine1", statuses->down_machines(0).hostname());
 
   // Reactivate machine1.
   machines = createMachineList({machine1});
@@ -1029,15 +1029,15 @@ TEST_F(MasterMaintenanceTest, MachineStatus)
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
 
   // Check that only one machine remains.
-  statuses_ = JSON::parse<JSON::Object>(response.get().body);
+  statuses_ = JSON::parse<JSON::Object>(response->body);
 
   ASSERT_SOME(statuses_);
   statuses = ::protobuf::parse<maintenance::ClusterStatus>(statuses_.get());
 
   ASSERT_SOME(statuses);
-  ASSERT_EQ(1, statuses.get().draining_machines().size());
-  ASSERT_EQ(0, statuses.get().down_machines().size());
-  ASSERT_EQ("0.0.0.2", statuses.get().draining_machines(0).id().ip());
+  ASSERT_EQ(1, statuses->draining_machines().size());
+  ASSERT_EQ(0, statuses->down_machines().size());
+  ASSERT_EQ("0.0.0.2", statuses->draining_machines(0).id().ip());
 }
 
 
@@ -1089,18 +1089,18 @@ TEST_F(MasterMaintenanceTest, InverseOffers)
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
 
-  Try<JSON::Object> statuses_ = JSON::parse<JSON::Object>(response.get().body);
+  Try<JSON::Object> statuses_ = JSON::parse<JSON::Object>(response->body);
   ASSERT_SOME(statuses_);
   Try<maintenance::ClusterStatus> statuses =
     ::protobuf::parse<maintenance::ClusterStatus>(statuses_.get());
 
   ASSERT_SOME(statuses);
-  ASSERT_EQ(0, statuses.get().down_machines().size());
-  ASSERT_EQ(1, statuses.get().draining_machines().size());
+  ASSERT_EQ(0, statuses->down_machines().size());
+  ASSERT_EQ(1, statuses->draining_machines().size());
   ASSERT_EQ(
       maintenanceHostname,
-      statuses.get().draining_machines(0).id().hostname());
-  ASSERT_EQ(0, statuses.get().draining_machines(0).statuses().size());
+      statuses->draining_machines(0).id().hostname());
+  ASSERT_EQ(0, statuses->draining_machines(0).statuses().size());
 
   // Now start a framework.
   auto scheduler = std::make_shared<v1::MockHTTPScheduler>();
@@ -1261,25 +1261,25 @@ TEST_F(MasterMaintenanceTest, InverseOffers)
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
 
-  statuses_ = JSON::parse<JSON::Object>(response.get().body);
+  statuses_ = JSON::parse<JSON::Object>(response->body);
   ASSERT_SOME(statuses_);
   statuses = ::protobuf::parse<maintenance::ClusterStatus>(statuses_.get());
 
   ASSERT_SOME(statuses);
-  ASSERT_EQ(0, statuses.get().down_machines().size());
-  ASSERT_EQ(1, statuses.get().draining_machines().size());
+  ASSERT_EQ(0, statuses->down_machines().size());
+  ASSERT_EQ(1, statuses->draining_machines().size());
   ASSERT_EQ(
       maintenanceHostname,
-      statuses.get().draining_machines(0).id().hostname());
+      statuses->draining_machines(0).id().hostname());
 
-  ASSERT_EQ(1, statuses.get().draining_machines(0).statuses().size());
+  ASSERT_EQ(1, statuses->draining_machines(0).statuses().size());
   ASSERT_EQ(
       mesos::allocator::InverseOfferStatus::DECLINE,
-      statuses.get().draining_machines(0).statuses(0).status());
+      statuses->draining_machines(0).statuses(0).status());
 
   ASSERT_EQ(
       id,
-      evolve(statuses.get().draining_machines(0).statuses(0).framework_id()));
+      evolve(statuses->draining_machines(0).statuses(0).framework_id()));
 
   updateInverseOffer =
     FUTURE_DISPATCH(_, &MesosAllocatorProcess::updateInverseOffer);
@@ -1325,25 +1325,25 @@ TEST_F(MasterMaintenanceTest, InverseOffers)
 
   AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
 
-  statuses_ = JSON::parse<JSON::Object>(response.get().body);
+  statuses_ = JSON::parse<JSON::Object>(response->body);
   ASSERT_SOME(statuses_);
   statuses = ::protobuf::parse<maintenance::ClusterStatus>(statuses_.get());
 
   ASSERT_SOME(statuses);
-  ASSERT_EQ(0, statuses.get().down_machines().size());
-  ASSERT_EQ(1, statuses.get().draining_machines().size());
+  ASSERT_EQ(0, statuses->down_machines().size());
+  ASSERT_EQ(1, statuses->draining_machines().size());
   ASSERT_EQ(
       maintenanceHostname,
-      statuses.get().draining_machines(0).id().hostname());
+      statuses->draining_machines(0).id().hostname());
 
-  ASSERT_EQ(1, statuses.get().draining_machines(0).statuses().size());
+  ASSERT_EQ(1, statuses->draining_machines(0).statuses().size());
   ASSERT_EQ(
       mesos::allocator::InverseOfferStatus::ACCEPT,
-      statuses.get().draining_machines(0).statuses(0).status());
+      statuses->draining_machines(0).statuses(0).status());
 
   ASSERT_EQ(
       id,
-      evolve(statuses.get().draining_machines(0).statuses(0).framework_id()));
+      evolve(statuses->draining_machines(0).statuses(0).framework_id()));
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -1853,10 +1853,10 @@ TEST_F(MasterMaintenanceTest, AcceptInvalidInverseOffer)
   driver.start();
 
   AWAIT_READY(frameworkRegisteredMessage);
-  UPID frameworkPid = frameworkRegisteredMessage.get().to;
+  UPID frameworkPid = frameworkRegisteredMessage->to;
 
   FrameworkRegisteredMessage message;
-  ASSERT_TRUE(message.ParseFromString(frameworkRegisteredMessage.get().body));
+  ASSERT_TRUE(message.ParseFromString(frameworkRegisteredMessage->body));
 
   FrameworkID frameworkId = message.framework_id();
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/master_slave_reconciliation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_slave_reconciliation_tests.cpp b/src/tests/master_slave_reconciliation_tests.cpp
index 1c7a3d6..9c31eea 100644
--- a/src/tests/master_slave_reconciliation_tests.cpp
+++ b/src/tests/master_slave_reconciliation_tests.cpp
@@ -122,7 +122,7 @@ TEST_F(MasterSlaveReconciliationTest, SlaveReregisterTerminatedExecutor)
   driver.start();
 
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   // Make sure the acknowledgement reaches the slave.
   AWAIT_READY(statusUpdateAcknowledgementMessage);
@@ -159,7 +159,7 @@ TEST_F(MasterSlaveReconciliationTest, SlaveReregisterTerminatedExecutor)
   detector.appoint(master.get()->pid);
 
   AWAIT_READY(status2);
-  EXPECT_EQ(TASK_FINISHED, status2.get().state());
+  EXPECT_EQ(TASK_FINISHED, status2->state());
 
   driver.stop();
   driver.join();
@@ -194,7 +194,7 @@ TEST_F(MasterSlaveReconciliationTest, ReconcileLostTask)
 
   AWAIT_READY(offers);
 
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("test task");
@@ -233,10 +233,10 @@ TEST_F(MasterSlaveReconciliationTest, ReconcileLostTask)
 
   AWAIT_READY(status);
 
-  EXPECT_EQ(task.task_id(), status.get().task_id());
-  EXPECT_EQ(TASK_LOST, status.get().state());
-  EXPECT_EQ(TaskStatus::SOURCE_SLAVE, status.get().source());
-  EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, status.get().reason());
+  EXPECT_EQ(task.task_id(), status->task_id());
+  EXPECT_EQ(TASK_LOST, status->state());
+  EXPECT_EQ(TaskStatus::SOURCE_SLAVE, status->source());
+  EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, status->reason());
 
   // Before we obtain the metrics, ensure that the master has finished
   // processing the status update so metrics have been updated.
@@ -289,7 +289,7 @@ TEST_F(MasterSlaveReconciliationTest, ReconcileDroppedTask)
 
   AWAIT_READY(offers);
 
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("test task");
@@ -328,10 +328,10 @@ TEST_F(MasterSlaveReconciliationTest, ReconcileDroppedTask)
 
   AWAIT_READY(status);
 
-  EXPECT_EQ(task.task_id(), status.get().task_id());
-  EXPECT_EQ(TASK_DROPPED, status.get().state());
-  EXPECT_EQ(TaskStatus::SOURCE_SLAVE, status.get().source());
-  EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, status.get().reason());
+  EXPECT_EQ(task.task_id(), status->task_id());
+  EXPECT_EQ(TASK_DROPPED, status->state());
+  EXPECT_EQ(TaskStatus::SOURCE_SLAVE, status->source());
+  EXPECT_EQ(TaskStatus::REASON_RECONCILIATION, status->reason());
 
   // Before we obtain the metrics, ensure that the master has finished
   // processing the status update so metrics have been updated.
@@ -411,7 +411,7 @@ TEST_F(MasterSlaveReconciliationTest, ReconcileRace)
   AWAIT_READY(reregisterSlaveMessage);
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("test task");
@@ -474,7 +474,7 @@ TEST_F(MasterSlaveReconciliationTest, ReconcileRace)
   executorDriver->sendStatusUpdate(taskStatus);
 
   AWAIT_READY(status);
-  ASSERT_EQ(TASK_FINISHED, status.get().state());
+  ASSERT_EQ(TASK_FINISHED, status->state());
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -511,7 +511,7 @@ TEST_F(MasterSlaveReconciliationTest, SlaveReregisterPendingTask)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   // No TASK_LOST updates should occur!
   EXPECT_CALL(sched, statusUpdate(&driver, _))
@@ -580,7 +580,7 @@ TEST_F(MasterSlaveReconciliationTest, SlaveReregisterTerminalTask)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("test task");
@@ -629,7 +629,7 @@ TEST_F(MasterSlaveReconciliationTest, SlaveReregisterTerminalTask)
   Clock::settle();
 
   AWAIT_READY(status);
-  ASSERT_EQ(TASK_FINISHED, status.get().state());
+  ASSERT_EQ(TASK_FINISHED, status->state());
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));
@@ -668,7 +668,7 @@ TEST_F(MasterSlaveReconciliationTest, SlaveReregisterFrameworks)
   driver.start();
 
   AWAIT_READY(offers);
-  EXPECT_NE(0u, offers.get().size());
+  EXPECT_NE(0u, offers->size());
 
   TaskInfo task;
   task.set_name("test task");
@@ -692,7 +692,7 @@ TEST_F(MasterSlaveReconciliationTest, SlaveReregisterFrameworks)
 
   // Wait until TASK_RUNNING of the task is received.
   AWAIT_READY(status);
-  EXPECT_EQ(TASK_RUNNING, status.get().state());
+  EXPECT_EQ(TASK_RUNNING, status->state());
 
   Future<ReregisterSlaveMessage> reregisterSlave =
     FUTURE_PROTOBUF(ReregisterSlaveMessage(), _, _);
@@ -705,7 +705,7 @@ TEST_F(MasterSlaveReconciliationTest, SlaveReregisterFrameworks)
   // active frameworks.
   AWAIT_READY(reregisterSlave);
 
-  EXPECT_EQ(1u, reregisterSlave.get().frameworks().size());
+  EXPECT_EQ(1u, reregisterSlave->frameworks().size());
 
   EXPECT_CALL(exec, shutdown(_))
     .Times(AtMost(1));