You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by al...@apache.org on 2017/05/11 10:16:49 UTC
[08/11] mesos git commit: Captured AgentID from the offer by
reference in tests.
Captured AgentID from the offer by reference in tests.
Review: https://reviews.apache.org/r/58817
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5435f84c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5435f84c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5435f84c
Branch: refs/heads/master
Commit: 5435f84c8319ebb1359df92a7ca88cbb1bec0582
Parents: 721ee58
Author: Alexander Rukletsov <al...@apache.org>
Authored: Thu Apr 27 22:22:01 2017 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Thu May 11 12:15:55 2017 +0200
----------------------------------------------------------------------
src/tests/check_tests.cpp | 28 ++++++++++++++--------------
src/tests/slave_tests.cpp | 10 +++++-----
2 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/5435f84c/src/tests/check_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/check_tests.cpp b/src/tests/check_tests.cpp
index 13417da..c998a96 100644
--- a/src/tests/check_tests.cpp
+++ b/src/tests/check_tests.cpp
@@ -285,7 +285,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
AWAIT_READY(offers);
EXPECT_NE(0, offers->offers().size());
const v1::Offer& offer = offers->offers(0);
- const v1::AgentID agentId = offer.agent_id();
+ const v1::AgentID& agentId = offer.agent_id();
Future<Event::Update> updateTaskRunning;
Future<Event::Update> updateCheckResult;
@@ -434,7 +434,7 @@ TEST_F(CommandExecutorCheckTest, CommandCheckStatusChange)
AWAIT_READY(offers);
EXPECT_NE(0, offers->offers().size());
const v1::Offer& offer = offers->offers(0);
- const v1::AgentID agentId = offer.agent_id();
+ const v1::AgentID& agentId = offer.agent_id();
Future<Event::Update> updateTaskRunning;
Future<Event::Update> updateCheckResult;
@@ -554,7 +554,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
AWAIT_READY(offers);
EXPECT_NE(0, offers->offers().size());
const v1::Offer& offer = offers->offers(0);
- const v1::AgentID agentId = offer.agent_id();
+ const v1::AgentID& agentId = offer.agent_id();
Future<Event::Update> updateTaskRunning;
Future<Event::Update> updateCheckResult;
@@ -656,7 +656,7 @@ TEST_F(CommandExecutorCheckTest, CommandCheckTimeout)
AWAIT_READY(offers);
EXPECT_NE(0, offers->offers().size());
const v1::Offer& offer = offers->offers(0);
- const v1::AgentID agentId = offer.agent_id();
+ const v1::AgentID& agentId = offer.agent_id();
Future<Event::Update> updateTaskRunning;
Future<Event::Update> updateCheckResult;
@@ -761,7 +761,7 @@ TEST_F(CommandExecutorCheckTest, CommandCheckAndHealthCheckNoShadowing)
AWAIT_READY(offers);
EXPECT_NE(0, offers->offers().size());
const v1::Offer& offer = offers->offers(0);
- const v1::AgentID agentId = offer.agent_id();
+ const v1::AgentID& agentId = offer.agent_id();
Future<Event::Update> updateTaskRunning;
Future<Event::Update> updateCheckResult;
@@ -910,7 +910,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(CommandExecutorCheckTest, HTTPCheckDelivered)
AWAIT_READY(offers);
EXPECT_NE(0, offers->offers().size());
const v1::Offer& offer = offers->offers(0);
- const v1::AgentID agentId = offer.agent_id();
+ const v1::AgentID& agentId = offer.agent_id();
Future<v1::scheduler::Event::Update> updateTaskRunning;
Future<v1::scheduler::Event::Update> updateCheckResult;
@@ -1043,7 +1043,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(CommandExecutorCheckTest, TCPCheckDelivered)
AWAIT_READY(offers);
EXPECT_NE(0, offers->offers().size());
const v1::Offer& offer = offers->offers(0);
- const v1::AgentID agentId = offer.agent_id();
+ const v1::AgentID& agentId = offer.agent_id();
Future<v1::scheduler::Event::Update> updateTaskRunning;
Future<v1::scheduler::Event::Update> updateCheckResult;
@@ -1252,7 +1252,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
AWAIT_READY(offers);
EXPECT_NE(0, offers->offers().size());
const v1::Offer& offer = offers->offers(0);
- const v1::AgentID agentId = offer.agent_id();
+ const v1::AgentID& agentId = offer.agent_id();
Future<Event::Update> updateTaskRunning;
Future<Event::Update> updateCheckResult;
@@ -1446,7 +1446,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
AWAIT_READY(offers);
EXPECT_NE(0, offers->offers().size());
const v1::Offer& offer = offers->offers(0);
- const v1::AgentID agentId = offer.agent_id();
+ const v1::AgentID& agentId = offer.agent_id();
Future<Event::Update> updateTaskRunning;
Future<Event::Update> updateCheckResult;
@@ -1607,7 +1607,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
AWAIT_READY(offers);
EXPECT_NE(0, offers->offers().size());
const v1::Offer& offer = offers->offers(0);
- const v1::AgentID agentId = offer.agent_id();
+ const v1::AgentID& agentId = offer.agent_id();
Future<Event::Update> updateTaskRunning;
Future<Event::Update> updateCheckResult;
@@ -1753,7 +1753,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(DefaultExecutorCheckTest, CommandCheckTimeout)
AWAIT_READY(offers);
EXPECT_NE(0, offers->offers().size());
const v1::Offer& offer = offers->offers(0);
- const v1::AgentID agentId = offer.agent_id();
+ const v1::AgentID& agentId = offer.agent_id();
Future<Event::Update> updateTaskRunning;
Future<Event::Update> updateCheckResult;
@@ -1901,7 +1901,7 @@ TEST_F(DefaultExecutorCheckTest, CommandCheckAndHealthCheckNoShadowing)
AWAIT_READY(offers);
EXPECT_NE(0, offers->offers().size());
const v1::Offer& offer = offers->offers(0);
- const v1::AgentID agentId = offer.agent_id();
+ const v1::AgentID& agentId = offer.agent_id();
Future<Event::Update> updateTaskRunning;
Future<Event::Update> updateCheckResult;
@@ -2071,7 +2071,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(DefaultExecutorCheckTest, HTTPCheckDelivered)
AWAIT_READY(offers);
EXPECT_NE(0, offers->offers().size());
const v1::Offer& offer = offers->offers(0);
- const v1::AgentID agentId = offer.agent_id();
+ const v1::AgentID& agentId = offer.agent_id();
Future<v1::scheduler::Event::Update> updateTaskRunning;
Future<v1::scheduler::Event::Update> updateCheckResult;
@@ -2220,7 +2220,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(DefaultExecutorCheckTest, TCPCheckDelivered)
AWAIT_READY(offers);
EXPECT_NE(0, offers->offers().size());
const v1::Offer& offer = offers->offers(0);
- const v1::AgentID agentId = offer.agent_id();
+ const v1::AgentID& agentId = offer.agent_id();
Future<v1::scheduler::Event::Update> updateTaskRunning;
Future<v1::scheduler::Event::Update> updateCheckResult;
http://git-wip-us.apache.org/repos/asf/mesos/blob/5435f84c/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index 8c97dc6..8f81f77 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -5399,7 +5399,7 @@ TEST_F(SlaveTest, RunTaskGroupFailedSecretGeneration)
ASSERT_NE(0, offers->offers().size());
const v1::Offer& offer = offers->offers(0);
- const v1::AgentID agentId = offer.agent_id();
+ const v1::AgentID& agentId = offer.agent_id();
v1::TaskInfo taskInfo1 = v1::createTask(agentId, resources, "");
@@ -5600,7 +5600,7 @@ TEST_F(SlaveTest, RunTaskGroupInvalidExecutorSecret)
ASSERT_NE(0, offers->offers().size());
const v1::Offer& offer = offers->offers(0);
- const v1::AgentID agentId = offer.agent_id();
+ const v1::AgentID& agentId = offer.agent_id();
v1::TaskInfo taskInfo1 = v1::createTask(agentId, resources, "");
@@ -5810,7 +5810,7 @@ TEST_F(SlaveTest, RunTaskGroupReferenceTypeSecret)
ASSERT_NE(0, offers->offers().size());
const v1::Offer& offer = offers->offers(0);
- const v1::AgentID agentId = offer.agent_id();
+ const v1::AgentID& agentId = offer.agent_id();
v1::TaskInfo taskInfo1 = v1::createTask(agentId, resources, "");
@@ -6020,7 +6020,7 @@ TEST_F(SlaveTest, RunTaskGroupGenerateSecretAfterShutdown)
ASSERT_NE(0, offers->offers().size());
const v1::Offer& offer = offers->offers(0);
- const v1::AgentID agentId = offer.agent_id();
+ const v1::AgentID& agentId = offer.agent_id();
v1::TaskInfo taskInfo1 = v1::createTask(agentId, resources, "");
@@ -6247,7 +6247,7 @@ TEST_F(SlaveTest, RestartSlaveRequireExecutorAuthentication)
.WillOnce(FutureArg<1>(&update));
const v1::Offer offer = offers->offers(0);
- const v1::AgentID agentId = offer.agent_id();
+ const v1::AgentID& agentId = offer.agent_id();
v1::Resources resources =
v1::Resources::parse("cpus:0.1;mem:32;disk:32").get();