Updated Branches: refs/heads/master 30f8d4764 -> e7258d7f3
Disabled the RecoveryTimeout test. See: MESOS-685. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e7258d7f Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e7258d7f Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e7258d7f Branch: refs/heads/master Commit: e7258d7f3cd55c90a675a82af4617ac438c64ed8 Parents: 30f8d47 Author: Benjamin Mahler <bmah...@twitter.com> Authored: Tue Oct 15 18:27:24 2013 -0700 Committer: Benjamin Mahler <bmah...@twitter.com> Committed: Tue Oct 15 18:27:24 2013 -0700 ---------------------------------------------------------------------- src/tests/slave_recovery_tests.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/e7258d7f/src/tests/slave_recovery_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp index 4d262c6..02dd25f 100644 --- a/src/tests/slave_recovery_tests.cpp +++ b/src/tests/slave_recovery_tests.cpp @@ -720,7 +720,9 @@ TYPED_TEST(SlaveRecoveryTest, RecoverTerminatedExecutor) // is down, because the recovery timeout elapses. // When the slave comes back up with recovery=reconnect, make // sure the task is properly transitioned to FAILED. -TYPED_TEST(SlaveRecoveryTest, RecoveryTimeout) +// TODO(bmahler): Disabled for MESOS-685: the exited() event for the +// slave will not be delivered to the executor driver. +TYPED_TEST(SlaveRecoveryTest, DISABLED_RecoveryTimeout) { Try<PID<Master> > master = this->StartMaster(); ASSERT_SOME(master);