commit d45b95c2703614be991e761ac0297210f494f222
author Taylor Brandstetter <deadbeef@webrtc.org> Tue Mar 29 13:16:52 2016 -0700
committer Taylor Brandstetter <deadbeef@webrtc.org> Tue Mar 29 20:16:55 2016 +0000
tree ab4e07bc9f3707913ec9049a96a131c329c463ea
parent dd56fa8642fd0901861387debeb9f95ff45e0d39

Making new unit test assertions use the standard timeout.

This is to reduce the likelihood of them flaking in the future.

R=pthatcher@webrtc.org

Review URL: https://codereview.webrtc.org/1836253002 .

Cr-Commit-Position: refs/heads/master@{#12149}

webrtc/api/peerconnectioninterface_unittest.cc

diff --git a/webrtc/api/peerconnectioninterface_unittest.cc b/webrtc/api/peerconnectioninterface_unittest.cc
index 544a143..2c044e2 100644
--- a/webrtc/api/peerconnectioninterface_unittest.cc
+++ b/webrtc/api/peerconnectioninterface_unittest.cc
@@ -1868,11 +1868,11 @@
 
   scoped_refptr<MediaStreamInterface> remote_stream =
           pc_->remote_streams()->at(0);
-  EXPECT_EQ(MediaStreamTrackInterface::kEnded,
-            remote_stream->GetVideoTracks()[0]->state());
-  // Audio source state changes are posted.
+  // Track state may be updated asynchronously.
   EXPECT_EQ_WAIT(MediaStreamTrackInterface::kEnded,
-                 remote_stream->GetAudioTracks()[0]->state(), 10);
+                 remote_stream->GetAudioTracks()[0]->state(), kTimeout);
+  EXPECT_EQ_WAIT(MediaStreamTrackInterface::kEnded,
+                 remote_stream->GetVideoTracks()[0]->state(), kTimeout);
 }
 
 // Test that PeerConnection methods fails gracefully after
@@ -1995,10 +1995,11 @@
   EXPECT_TRUE(DoSetRemoteDescription(desc_ms2.release()));
   EXPECT_TRUE(CompareStreamCollections(observer_.remote_streams(),
                                        reference_collection_));
-  // Audio source state changes are posted.
+  // Track state may be updated asynchronously.
   EXPECT_EQ_WAIT(webrtc::MediaStreamTrackInterface::kEnded,
-                 audio_track2->state(), 1);
-  EXPECT_EQ(webrtc::MediaStreamTrackInterface::kEnded, video_track2->state());
+                 audio_track2->state(), kTimeout);
+  EXPECT_EQ_WAIT(webrtc::MediaStreamTrackInterface::kEnded,
+                 video_track2->state(), kTimeout);
 }
 
 // This tests that remote tracks are ended if a local session description is set
@@ -2043,10 +2044,11 @@
   ASSERT_TRUE(audio_info != nullptr);
   audio_info->rejected = true;
   EXPECT_TRUE(DoSetLocalDescription(local_offer.release()));
-  EXPECT_EQ(webrtc::MediaStreamTrackInterface::kEnded, remote_video->state());
-  // Audio source state changes are posted.
+  // Track state may be updated asynchronously.
   EXPECT_EQ_WAIT(webrtc::MediaStreamTrackInterface::kEnded,
-                 remote_audio->state(), 1);
+                 remote_audio->state(), kTimeout);
+  EXPECT_EQ_WAIT(webrtc::MediaStreamTrackInterface::kEnded,
+                 remote_video->state(), kTimeout);
 }
 
 // This tests that we won't crash if the remote track has been removed outside