Disabled pstree, killtree and slave recovery timeout tests.

apache · Oct 9, 2013 · 13b3013 · 13b3013
1 parent 3d958c3
commit 13b3013
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp
@@ -403,7 +403,9 @@ void dosetsid(void)
 }
 
 
-TEST_F(OsTest, killtree)
+// Disabled in 0.14.0 due to MESOS-641. Will be re-enabled
+// after fixes in 0.14.1.
+TEST_F(OsTest, DISABLED_killtree)
 {
   Try<ProcessTree> tree =
     Fork(dosetsid,                         // Child.
@@ -490,7 +492,9 @@ TEST_F(OsTest, killtree)
 }
 
 
-TEST_F(OsTest, pstree)
+// Disabled in 0.14.0 due to MESOS-641. Will be re-enabled
+// after fixes in 0.14.1.
+TEST_F(OsTest, DISABLED_pstree)
 {
   Try<ProcessTree> tree = os::pstree(getpid());
 

diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp
@@ -695,7 +695,8 @@ 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)
+// Disabled in 0.14.0 due to MESOS-685.
+TYPED_TEST(SlaveRecoveryTest, DISABLED_RecoveryTimeout)
 {
   Try<PID<Master> > master = this->StartMaster();
   ASSERT_SOME(master);