Fixing flaky SignalThread tests.

webrtc/base/signalthread_unittest.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include <memory>
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/signalthread.h"
 #include "webrtc/base/thread.h"
 
 using namespace rtc;
 
+// 10 seconds.
+static const int kTimeout = 10000;
+
 class SignalThreadTest : public testing::Test, public sigslot::has_slots<> {
  public:
   class SlowSignalThread : public SignalThread {
    public:
     SlowSignalThread(SignalThreadTest* harness) : harness_(harness) {
     }
 
     virtual ~SlowSignalThread() {
       EXPECT_EQ(harness_->main_thread_, Thread::Current());
       ++harness_->thread_deleted_;
@@ skipping 122 matching lines @@
   Thread::Current()->socketserver()->Wait(500, false);
 }
 
 #define EXPECT_STATE(started, done, completed, stopped, deleted) \
   EXPECT_EQ(started, thread_started_); \
   EXPECT_EQ(done, thread_done_); \
   EXPECT_EQ(completed, thread_completed_); \
   EXPECT_EQ(stopped, thread_stopped_); \
   EXPECT_EQ(deleted, thread_deleted_);
 
-#if defined(WEBRTC_LINUX)
-#define MAYBE_ThreadFinishes DISABLED_ThreadFinishes
-#else
-#define MAYBE_ThreadFinishes ThreadFinishes
-#endif
-TEST_F(SignalThreadTest, MAYBE_ThreadFinishes) {
+#define EXPECT_STATE_WAIT(started, done, completed, stopped, deleted, timeout) \
+  EXPECT_EQ_WAIT(started, thread_started_, timeout); \
+  EXPECT_EQ_WAIT(done, thread_done_, timeout); \
+  EXPECT_EQ_WAIT(completed, thread_completed_, timeout); \
+  EXPECT_EQ_WAIT(stopped, thread_stopped_, timeout); \
+  EXPECT_EQ_WAIT(deleted, thread_deleted_, timeout);
+
+TEST_F(SignalThreadTest, ThreadFinishes) {
   thread_->Start();
   EXPECT_STATE(1, 0, 0, 0, 0);
-  Thread::SleepMs(500);
-  EXPECT_STATE(1, 0, 0, 0, 0);
-  Thread::Current()->ProcessMessages(0);
-  EXPECT_STATE(1, 1, 1, 0, 1);
+  EXPECT_STATE_WAIT(1, 1, 1, 0, 1, kTimeout);
 }
 
-#if defined(WEBRTC_LINUX)
-#define MAYBE_ReleasedThreadFinishes DISABLED_ReleasedThreadFinishes
-#else
-#define MAYBE_ReleasedThreadFinishes ReleasedThreadFinishes
-#endif
-TEST_F(SignalThreadTest, MAYBE_ReleasedThreadFinishes) {
+TEST_F(SignalThreadTest, ReleasedThreadFinishes) {
   thread_->Start();
   EXPECT_STATE(1, 0, 0, 0, 0);
   thread_->Release();
   called_release_ = true;
   EXPECT_STATE(1, 0, 0, 0, 0);
-  Thread::SleepMs(500);
-  EXPECT_STATE(1, 0, 0, 0, 0);
-  Thread::Current()->ProcessMessages(0);
-  EXPECT_STATE(1, 1, 1, 0, 1);
+  EXPECT_STATE_WAIT(1, 1, 1, 0, 1, kTimeout);
 }
 
 TEST_F(SignalThreadTest, DestroyedThreadCleansUp) {
   thread_->Start();
   EXPECT_STATE(1, 0, 0, 0, 0);
   thread_->Destroy(true);
   EXPECT_STATE(1, 0, 0, 1, 1);
   Thread::Current()->ProcessMessages(0);
   EXPECT_STATE(1, 0, 0, 1, 1);
 }
 
 TEST_F(SignalThreadTest, DeferredDestroyedThreadCleansUp) {
   thread_->Start();
   EXPECT_STATE(1, 0, 0, 0, 0);
   thread_->Destroy(false);
   EXPECT_STATE(1, 0, 0, 1, 0);
-  Thread::SleepMs(500);
-  EXPECT_STATE(1, 0, 0, 1, 0);
-  Thread::Current()->ProcessMessages(0);
-  EXPECT_STATE(1, 1, 0, 1, 1);
+  EXPECT_STATE_WAIT(1, 1, 0, 1, 1, kTimeout);
 }