Disable WebRtcBrowserTest.CanMakeVideoCallAndThenRenegotiateToAudio t…

…est on tsan bot that is failing due to circular lock BUG=457061 TBR=guoweis@chromium.org Review URL: https://codereview.chromium.org/910113002 Cr-Commit-Position: refs/heads/master@{#315477}
FairyWorld · Feb 10, 2015 · c92f6d6 · c92f6d6
1 parent d129b92
commit c92f6d6
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/content/browser/media/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc
@@ -182,8 +182,15 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest,
   MakeTypicalPeerConnectionCall(kJavascript);
 }
 
+// Circular lock: crbug.com/457061
+#if defined(THREAD_SANITIZER)
+#define MAYBE_CanMakeAudioCallAndThenRenegotiateToVideo DISABLED_CanMakeAudioCallAndThenRenegotiateToVideo
+#else
+#define MAYBE_CanMakeAudioCallAndThenRenegotiateToVideo CanMakeAudioCallAndThenRenegotiateToVideo
+#endif
+
 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest,
-                       CanMakeAudioCallAndThenRenegotiateToVideo) {
+                       MAYBE_CanMakeAudioCallAndThenRenegotiateToVideo) {
   const char* kJavascript =
       "callAndRenegotiateToVideo({audio: true}, {audio: true, video:true});";
   MakeTypicalPeerConnectionCall(kJavascript);