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:33 UTC
[5/8] mesos git commit: Replace `.get().` in favor of the `->`
operator in tests.
http://git-wip-us.apache.org/repos/asf/mesos/blob/613d3ee3/src/tests/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));