Repository: mesos Updated Branches: refs/heads/master 66ebdfdc4 -> b43bb4fea
Removed unnecessary await from test. Review: https://reviews.apache.org/r/49892/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b43bb4fe Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b43bb4fe Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b43bb4fe Branch: refs/heads/master Commit: b43bb4feaec945dccd1c6b4b1f2647a3f45745b9 Parents: 66ebdfd Author: Joerg Schad <jo...@mesosphere.io> Authored: Tue Jul 19 15:43:45 2016 -0700 Committer: Vinod Kone <vinodk...@gmail.com> Committed: Tue Jul 19 15:43:45 2016 -0700 ---------------------------------------------------------------------- src/tests/master_slave_reconciliation_tests.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/b43bb4fe/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 3bb6499..fdb9bb6 100644 --- a/src/tests/master_slave_reconciliation_tests.cpp +++ b/src/tests/master_slave_reconciliation_tests.cpp @@ -590,8 +590,6 @@ TEST_F(MasterSlaveReconciliationTest, SlaveReregisterFrameworks) EXPECT_CALL(exec, launchTask(_, _)) .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING)); - Future<Nothing> _statusUpdate = FUTURE_DISPATCH(_, &Slave::_statusUpdate); - Future<TaskStatus> status; EXPECT_CALL(sched, statusUpdate(&driver, _)) .WillOnce(FutureArg<1>(&status)) @@ -599,7 +597,9 @@ TEST_F(MasterSlaveReconciliationTest, SlaveReregisterFrameworks) driver.launchTasks(offers.get()[0].id(), {task}); - AWAIT_READY(_statusUpdate); + // Wait until TASK_RUNNING of the task is received. + AWAIT_READY(status); + EXPECT_EQ(TASK_RUNNING, status.get().state()); Future<ReregisterSlaveMessage> reregisterSlave = FUTURE_PROTOBUF(ReregisterSlaveMessage(), _, _); @@ -614,8 +614,6 @@ TEST_F(MasterSlaveReconciliationTest, SlaveReregisterFrameworks) EXPECT_EQ(1u, reregisterSlave.get().frameworks().size()); - AWAIT_READY(status); - EXPECT_CALL(exec, shutdown(_)) .Times(AtMost(1));