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/10/18 22:42:30 UTC
mesos git commit: Cleaned up style in several tests.
Repository: mesos
Updated Branches:
refs/heads/master 257cd8060 -> aa54701a4
Cleaned up style in several tests.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/aa54701a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/aa54701a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/aa54701a
Branch: refs/heads/master
Commit: aa54701a4b297586c7ba3627c3cc66717db7dbea
Parents: 257cd80
Author: Alexander Rukletsov <al...@apache.org>
Authored: Wed Oct 18 15:42:14 2017 -0700
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Wed Oct 18 15:42:14 2017 -0700
----------------------------------------------------------------------
src/tests/api_tests.cpp | 4 ++--
src/tests/check_tests.cpp | 1 -
src/tests/containerizer/port_mapping_tests.cpp | 2 +-
src/tests/default_executor_tests.cpp | 13 ++++++-------
src/tests/reservation_endpoints_tests.cpp | 4 ++--
src/tests/slave_authorization_tests.cpp | 4 ++--
src/tests/slave_tests.cpp | 8 ++++----
7 files changed, 17 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/aa54701a/src/tests/api_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/api_tests.cpp b/src/tests/api_tests.cpp
index ce3aafd..b3efac9 100644
--- a/src/tests/api_tests.cpp
+++ b/src/tests/api_tests.cpp
@@ -2357,8 +2357,8 @@ TEST_P(MasterAPITest, EventAuthorizationFiltering)
Future<mesos::v1::scheduler::Event::Update> updateRunning1;
EXPECT_CALL(*scheduler, update(_, _))
.WillOnce(DoAll(
- FutureArg<1>(&updateRunning1),
- v1::scheduler::SendAcknowledge(frameworkId, agentId)));
+ FutureArg<1>(&updateRunning1),
+ v1::scheduler::SendAcknowledge(frameworkId, agentId)));
EXPECT_CALL(executor1, registered(_, _, _, _));
EXPECT_CALL(executor2, registered(_, _, _, _));
http://git-wip-us.apache.org/repos/asf/mesos/blob/aa54701a/src/tests/check_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/check_tests.cpp b/src/tests/check_tests.cpp
index 9a56c00..d3ffc0b 100644
--- a/src/tests/check_tests.cpp
+++ b/src/tests/check_tests.cpp
@@ -2832,7 +2832,6 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(DefaultExecutorCheckTest, TCPCheckDelivered)
// Acknowledge (to be able to get the next update).
acknowledge(&mesos, frameworkId, taskStarting);
-
AWAIT_READY(updateTaskRunning);
const v1::TaskStatus& taskRunning = updateTaskRunning->status();
http://git-wip-us.apache.org/repos/asf/mesos/blob/aa54701a/src/tests/containerizer/port_mapping_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/port_mapping_tests.cpp b/src/tests/containerizer/port_mapping_tests.cpp
index 4b8282d..a25f372 100644
--- a/src/tests/containerizer/port_mapping_tests.cpp
+++ b/src/tests/containerizer/port_mapping_tests.cpp
@@ -2326,7 +2326,7 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_RecoverMixedKnownAndUnKnownOrphans)
driver.launchTasks(offers.get()[0].id(), {task1, task2});
// Only check the first and the last status, as the other two might
- // be interleaved between TASK_STARTING and TASK_RUNNING
+ // be interleaved between TASK_STARTING and TASK_RUNNING.
AWAIT_READY(status1);
ASSERT_EQ(TASK_STARTING, status1->state());
http://git-wip-us.apache.org/repos/asf/mesos/blob/aa54701a/src/tests/default_executor_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/default_executor_tests.cpp b/src/tests/default_executor_tests.cpp
index 1669a85..b3c1d82 100644
--- a/src/tests/default_executor_tests.cpp
+++ b/src/tests/default_executor_tests.cpp
@@ -180,8 +180,8 @@ TEST_P(DefaultExecutorTest, TaskRunning)
Future<v1::scheduler::Event::Update> runningUpdate;
EXPECT_CALL(*scheduler, update(_, _))
.WillOnce(DoAll(
- FutureArg<1>(&startingUpdate),
- v1::scheduler::SendAcknowledge(frameworkId, agentId)))
+ FutureArg<1>(&startingUpdate),
+ v1::scheduler::SendAcknowledge(frameworkId, agentId)))
.WillOnce(FutureArg<1>(&runningUpdate))
.WillRepeatedly(Return());
@@ -1233,14 +1233,13 @@ TEST_P(DefaultExecutorTest, SigkillExecutor)
Future<v1::scheduler::Event::Update> runningUpdate;
EXPECT_CALL(*scheduler, update(_, _))
.WillOnce(DoAll(
- FutureArg<1>(&startingUpdate),
- v1::scheduler::SendAcknowledge(frameworkId, agentId)))
+ FutureArg<1>(&startingUpdate),
+ v1::scheduler::SendAcknowledge(frameworkId, agentId)))
.WillOnce(DoAll(
- FutureArg<1>(&runningUpdate),
- v1::scheduler::SendAcknowledge(frameworkId, agentId)))
+ FutureArg<1>(&runningUpdate),
+ v1::scheduler::SendAcknowledge(frameworkId, agentId)))
.WillRepeatedly(Return());
-
v1::Offer::Operation launchGroup = v1::LAUNCH_GROUP(
executorInfo,
v1::createTaskGroupInfo({taskInfo}));
http://git-wip-us.apache.org/repos/asf/mesos/blob/aa54701a/src/tests/reservation_endpoints_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/reservation_endpoints_tests.cpp b/src/tests/reservation_endpoints_tests.cpp
index 3645cd8..a96cc71 100644
--- a/src/tests/reservation_endpoints_tests.cpp
+++ b/src/tests/reservation_endpoints_tests.cpp
@@ -409,8 +409,8 @@ TEST_F(ReservationEndpointsTest, ReserveAvailableAndOfferedResources)
TaskInfo taskInfo = createTask(offer.slave_id(), available, "sleep 1000");
// Expect a TASK_STARTING and a TASK_RUNNING status.
- EXPECT_CALL(sched, statusUpdate(_, _)).
- WillRepeatedly(Return());
+ EXPECT_CALL(sched, statusUpdate(_, _))
+ .WillRepeatedly(Return());
Future<Nothing> _statusUpdateAcknowledgement1 =
FUTURE_DISPATCH(_, &Slave::_statusUpdateAcknowledgement);
http://git-wip-us.apache.org/repos/asf/mesos/blob/aa54701a/src/tests/slave_authorization_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_authorization_tests.cpp b/src/tests/slave_authorization_tests.cpp
index 2dcfd6c..11fd0d4 100644
--- a/src/tests/slave_authorization_tests.cpp
+++ b/src/tests/slave_authorization_tests.cpp
@@ -640,7 +640,7 @@ TYPED_TEST(SlaveAuthorizerTest, AuthorizeRunTaskOnAgent)
{offer.id()},
{LAUNCH({task1, task2})});
- // Wait for TASK_FAILED for 1st task, and TASK_STARTING followed by
+ // Wait for TASK_ERROR for 1st task, and TASK_STARTING followed by
// TASK_RUNNING for 2nd task.
AWAIT_READY(status0);
AWAIT_READY(status1);
@@ -648,7 +648,7 @@ TYPED_TEST(SlaveAuthorizerTest, AuthorizeRunTaskOnAgent)
// Validate both the statuses. Note that the order of receiving the
// status updates for the 2 tasks is not deterministic, but we know
- // that task2's TASK_RUNNING ARRIVES after TASK_STARTING.
+ // that task2's TASK_RUNNING arrives after TASK_STARTING.
hashmap<TaskID, TaskStatus> statuses;
statuses[status0->task_id()] = status0.get();
statuses[status1->task_id()] = status1.get();
http://git-wip-us.apache.org/repos/asf/mesos/blob/aa54701a/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index def64b5..99b9c82 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -6866,12 +6866,12 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
EXPECT_CALL(*scheduler, update(_, _))
.WillOnce(
DoAll(
- FutureArg<1>(&updateStarting),
- v1::scheduler::SendAcknowledge(frameworkId, agentId)))
+ FutureArg<1>(&updateStarting),
+ v1::scheduler::SendAcknowledge(frameworkId, agentId)))
.WillOnce(
DoAll(
- FutureArg<1>(&updateRunning),
- v1::scheduler::SendAcknowledge(frameworkId, agentId)))
+ FutureArg<1>(&updateRunning),
+ v1::scheduler::SendAcknowledge(frameworkId, agentId)))
.WillRepeatedly(Return()); // Ignore subsequent updates.
v1::Resources resources =