Repository: mesos Updated Branches: refs/heads/master da60d1c4e -> 0725e1bdb
Silenced a GMock warning in a test. Review: https://reviews.apache.org/r/56692 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0725e1bd Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0725e1bd Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0725e1bd Branch: refs/heads/master Commit: 0725e1bdb3a579d18f2314bde7b8298fc94b60e0 Parents: da60d1c Author: Neil Conway <[email protected]> Authored: Tue Feb 14 16:02:32 2017 -0800 Committer: Neil Conway <[email protected]> Committed: Fri Feb 17 12:12:53 2017 -0800 ---------------------------------------------------------------------- src/tests/master_validation_tests.cpp | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/0725e1bd/src/tests/master_validation_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_validation_tests.cpp b/src/tests/master_validation_tests.cpp index ea438ac..53771f6 100644 --- a/src/tests/master_validation_tests.cpp +++ b/src/tests/master_validation_tests.cpp @@ -3507,6 +3507,11 @@ TEST_F(FrameworkInfoValidationTest, RejectRoleChangeWithMultiRoleMasterFailover) EXPECT_EQ(TASK_RUNNING, runningStatus.get().state()); EXPECT_EQ(task.task_id(), runningStatus.get().task_id()); + // Since we launched a task, stopping the driver will cause the + // task and its executor to be shutdown. + EXPECT_CALL(exec, shutdown(_)) + .Times(AtMost(1)); + driver.stop(); driver.join(); }
