From b93a2451e06f8068ddb6495c0c28b7845c6ce560 Mon Sep 17 00:00:00 2001
From: Yves Gerey <yvesg@webrtc.org>
Date: Fri, 19 Jul 2019 22:46:13 +0200
Subject: [PATCH] [Unit tests] Remove race condition and dangling pointer to
 mock.

Lifetime issue: "webrtc_audio_module_rec_thread" was still accessing
                AudioTransport mock at and after its destruction.

Bug: webrtc:9751
Change-Id: I24308077cdeb77e570b8ec74098f1ae3397b7155
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/146217
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Commit-Queue: Yves Gerey <yvesg@google.com>
Cr-Commit-Position: refs/heads/master@{#28635}
---
 modules/audio_device/audio_device_unittest.cc | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/modules/audio_device/audio_device_unittest.cc b/modules/audio_device/audio_device_unittest.cc
index 48e54c7dc4..8e966f7943 100644
--- a/modules/audio_device/audio_device_unittest.cc
+++ b/modules/audio_device/audio_device_unittest.cc
@@ -555,6 +555,13 @@ class MAYBE_AudioDeviceTest
     }
   }
 
+  // This is needed by all tests using MockAudioTransport,
+  // since there is no way to unregister it.
+  // Without Terminate(), audio_device would still accesses
+  // the destructed mock via "webrtc_audio_module_rec_thread".
+  // An alternative would be for the mock to outlive audio_device.
+  void PreTearDown() { EXPECT_EQ(0, audio_device_->Terminate()); }
+
   virtual ~MAYBE_AudioDeviceTest() {
     if (audio_device_) {
       EXPECT_EQ(0, audio_device_->Terminate());
@@ -937,6 +944,7 @@ TEST_P(MAYBE_AudioDeviceTest, StartStopPlayoutWithInternalRestart) {
   EXPECT_TRUE(audio_device()->Playing());
   // Stop playout and the audio thread after successful internal restart.
   StopPlayout();
+  PreTearDown();
 }
 
 // Tests Start/Stop recording followed by a second session (emulates a restart
@@ -983,6 +991,7 @@ TEST_P(MAYBE_AudioDeviceTest, StartStopRecordingWithInternalRestart) {
   EXPECT_TRUE(audio_device()->Recording());
   // Stop recording and the audio thread after successful internal restart.
   StopRecording();
+  PreTearDown();
 }
 #endif  // #ifdef WEBRTC_WIN
 
@@ -1016,6 +1025,7 @@ TEST_P(MAYBE_AudioDeviceTest, StartRecordingVerifyCallbacks) {
   StartRecording();
   event()->Wait(kTestTimeOutInMilliseconds);
   StopRecording();
+  PreTearDown();
 }
 
 // Start playout and recording (full-duplex audio) and verify that audio is
@@ -1035,6 +1045,7 @@ TEST_P(MAYBE_AudioDeviceTest, StartPlayoutAndRecordingVerifyCallbacks) {
   event()->Wait(kTestTimeOutInMilliseconds);
   StopRecording();
   StopPlayout();
+  PreTearDown();
 }
 
 // Start playout and recording and store recorded data in an intermediate FIFO
@@ -1075,6 +1086,7 @@ TEST_P(MAYBE_AudioDeviceTest, RunPlayoutAndRecordingInFullDuplex) {
   // bots where relatively large average latencies can happen.
   EXPECT_LE(audio_stream.average_size(), 25u);
   PRINT("\n");
+  PreTearDown();
 }
 
 // Runs audio in full duplex until user hits Enter. Intended as a manual test
@@ -1104,6 +1116,7 @@ TEST_P(MAYBE_AudioDeviceTest,
   } while (getchar() != '\n');
   StopRecording();
   StopPlayout();
+  PreTearDown();
 }
 
 // Measures loopback latency and reports the min, max and average values for
@@ -1138,6 +1151,7 @@ TEST_P(MAYBE_AudioDeviceTest, DISABLED_MeasureLoopbackLatency) {
                 kImpulseFrequencyInHz * kMeasureLatencyTimeInSec - 2));
   // Print out min, max and average delay values for debugging purposes.
   audio_stream.PrintResults();
+  PreTearDown();
 }
 
 #ifdef WEBRTC_WIN