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:36 UTC
[8/8] mesos git commit: Replace `.get().` in favor of the `->`
operator in tests.
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.