From a8aa9076391a328e54b97673b60baa03f8d9795e Mon Sep 17 00:00:00 2001 From: ossu Date: Thu, 2 Jun 2016 08:47:07 -0700 Subject: [PATCH] Disabled two flaky subtests of SignalThreadTest. BUG=webrtc:5953 Review-Url: https://codereview.webrtc.org/2029523002 Cr-Commit-Position: refs/heads/master@{#13019} --- webrtc/base/signalthread_unittest.cc | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/webrtc/base/signalthread_unittest.cc b/webrtc/base/signalthread_unittest.cc index 57190128c5..95b4ac1d6e 100644 --- a/webrtc/base/signalthread_unittest.cc +++ b/webrtc/base/signalthread_unittest.cc @@ -159,7 +159,12 @@ TEST_F(SignalThreadTest, OwnerThreadGoesAway) { EXPECT_EQ(stopped, thread_stopped_); \ EXPECT_EQ(deleted, thread_deleted_); -TEST_F(SignalThreadTest, ThreadFinishes) { +#if defined(WEBRTC_LINUX) +#define MAYBE_ThreadFinishes DISABLED_ThreadFinishes +#else +#define MAYBE_ThreadFinishes ThreadFinishes +#endif +TEST_F(SignalThreadTest, MAYBE_ThreadFinishes) { thread_->Start(); EXPECT_STATE(1, 0, 0, 0, 0); Thread::SleepMs(500); @@ -168,7 +173,12 @@ TEST_F(SignalThreadTest, ThreadFinishes) { EXPECT_STATE(1, 1, 1, 0, 1); } -TEST_F(SignalThreadTest, ReleasedThreadFinishes) { +#if defined(WEBRTC_LINUX) +#define MAYBE_ReleasedThreadFinishes DISABLED_ReleasedThreadFinishes +#else +#define MAYBE_ReleasedThreadFinishes ReleasedThreadFinishes +#endif +TEST_F(SignalThreadTest, MAYBE_ReleasedThreadFinishes) { thread_->Start(); EXPECT_STATE(1, 0, 0, 0, 0); thread_->Release();