Cleaned up comments in fault tolerance tests. Review: https://reviews.apache.org/r/50418/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8a0b17a1 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8a0b17a1 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8a0b17a1 Branch: refs/heads/master Commit: 8a0b17a11560f482628e890094e83400fa805a80 Parents: 5de96fa Author: Neil Conway <neil.con...@gmail.com> Authored: Fri Aug 5 16:41:35 2016 -0700 Committer: Vinod Kone <vinodk...@gmail.com> Committed: Fri Aug 5 16:41:35 2016 -0700 ---------------------------------------------------------------------- src/tests/fault_tolerance_tests.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/8a0b17a1/src/tests/fault_tolerance_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/fault_tolerance_tests.cpp b/src/tests/fault_tolerance_tests.cpp index 661cc8b..5a9944c 100644 --- a/src/tests/fault_tolerance_tests.cpp +++ b/src/tests/fault_tolerance_tests.cpp @@ -158,7 +158,7 @@ TEST_F(FaultToleranceTest, MasterFailover) // This test ensures that a failed over master recovers completed tasks // from a slave's re-registration when the slave thinks the framework has // completed (but the framework has not actually completed yet from master's -// point of view. +// point of view). TEST_F(FaultToleranceTest, ReregisterCompletedFrameworks) { // Step 1. Start Master and Slave. @@ -340,6 +340,7 @@ TEST_F(FaultToleranceTest, ReregisterCompletedFrameworks) Future<Nothing> executorLost; EXPECT_CALL(sched, executorLost(&driver, DEFAULT_EXECUTOR_ID, _, _)) .WillOnce(FutureSatisfy(&executorLost)); + // Induce an ExitedExecutorMessage from the slave. containerizer.destroy( frameworkId.get(), DEFAULT_EXECUTOR_INFO.executor_id()); @@ -1082,8 +1083,8 @@ TEST_F(FaultToleranceTest, ReregisterFrameworkExitedExecutor) // 2. Framework re-registration. // // To achieve this, we need to: - // 1. Restart the master (the slave / framework will not detect - // the new master automatically using the BasicMasterDetector). + // 1. Restart the master (the slave / framework will not detect the + // new master automatically using the StandaloneMasterDetector). // 2. Notify the slave of the new master. // 3. Kill the executor. // 4. Drop the status update, but allow the ExitedExecutorMessage.