Repository: mesos Updated Branches: refs/heads/master 3711d66aa -> c662048ae
Fixed a typo. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c662048a Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c662048a Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c662048a Branch: refs/heads/master Commit: c662048ae365630e3249b51102c9f7f962cc24d3 Parents: 3711d66 Author: Jiang Yan Xu <[email protected]> Authored: Mon Apr 23 15:36:09 2018 -0700 Committer: Jiang Yan Xu <[email protected]> Committed: Mon Apr 23 15:37:16 2018 -0700 ---------------------------------------------------------------------- src/tests/partition_tests.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/c662048a/src/tests/partition_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/partition_tests.cpp b/src/tests/partition_tests.cpp index 9138e5c..606025a 100644 --- a/src/tests/partition_tests.cpp +++ b/src/tests/partition_tests.cpp @@ -2300,36 +2300,36 @@ TEST_F(PartitionTest, PartitionAwareTaskCompletedOnPartitionedAgent) Future<UpdateFrameworkMessage> frameworkUpdate = DROP_PROTOBUF( UpdateFrameworkMessage(), master.get()->pid, slave.get()->pid); - // The `finsihedStatusFromMaster` status update is sent as + // The `finishedStatusFromMaster` status update is sent as // part of agent's re-registration with the master. - // The second status update `finsihedStatusFromAgent` here + // The second status update `finishedStatusFromAgent` here // is sent by the agent's status update manager after it // re-regsiters. - Future<TaskStatus> finsihedStatusFromMaster; - Future<TaskStatus> finsihedStatusFromAgent; + Future<TaskStatus> finishedStatusFromMaster; + Future<TaskStatus> finishedStatusFromAgent; EXPECT_CALL(sched, statusUpdate(&driver, _)) - .WillOnce(FutureArg<1>(&finsihedStatusFromMaster)) - .WillOnce(FutureArg<1>(&finsihedStatusFromAgent)); + .WillOnce(FutureArg<1>(&finishedStatusFromMaster)) + .WillOnce(FutureArg<1>(&finishedStatusFromAgent)); detector.appoint(master.get()->pid); Clock::advance(agentFlags.registration_backoff_factor); AWAIT_READY(slaveReregistered); - AWAIT_READY(finsihedStatusFromMaster); - EXPECT_EQ(TASK_FINISHED, finsihedStatusFromMaster->state()); - EXPECT_EQ(TaskStatus::SOURCE_MASTER, finsihedStatusFromMaster->source()); + AWAIT_READY(finishedStatusFromMaster); + EXPECT_EQ(TASK_FINISHED, finishedStatusFromMaster->state()); + EXPECT_EQ(TaskStatus::SOURCE_MASTER, finishedStatusFromMaster->source()); EXPECT_EQ(TaskStatus::REASON_SLAVE_REREGISTERED, - finsihedStatusFromMaster->reason()); - EXPECT_EQ(task.task_id(), finsihedStatusFromMaster->task_id()); + finishedStatusFromMaster->reason()); + EXPECT_EQ(task.task_id(), finishedStatusFromMaster->task_id()); AWAIT_READY(frameworkUpdate); - AWAIT_READY(finsihedStatusFromAgent); - EXPECT_EQ(TASK_FINISHED, finsihedStatusFromAgent->state()); - EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, finsihedStatusFromAgent->source()); - EXPECT_EQ(task.task_id(), finsihedStatusFromAgent->task_id()); - EXPECT_EQ(slaveId, finsihedStatusFromAgent->slave_id()); + AWAIT_READY(finishedStatusFromAgent); + EXPECT_EQ(TASK_FINISHED, finishedStatusFromAgent->state()); + EXPECT_EQ(TaskStatus::SOURCE_EXECUTOR, finishedStatusFromAgent->source()); + EXPECT_EQ(task.task_id(), finishedStatusFromAgent->task_id()); + EXPECT_EQ(slaveId, finishedStatusFromAgent->slave_id()); // Perform explicit reconciliation. The task should not be running. TaskStatus status;
