Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

Side by Side Diff: content/browser/webrtc/webrtc_audio_browsertest.cc

Issue 2945613002: Disable flaky WebRtcAudioBrowserTest.CanMakeVideoCallAndThenRenegotiateToAudio on Linux. (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2016 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/files/file_util.h" 6 #include "base/files/file_util.h"
7 #include "base/threading/platform_thread.h" 7 #include "base/threading/platform_thread.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "content/browser/web_contents/web_contents_impl.h" 9 #include "content/browser/web_contents/web_contents_impl.h"
10 #include "content/browser/webrtc/webrtc_content_browsertest_base.h" 10 #include "content/browser/webrtc/webrtc_content_browsertest_base.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 ASSERT_TRUE(base::CommandLine::ForCurrentProcess()->HasSwitch( 55 ASSERT_TRUE(base::CommandLine::ForCurrentProcess()->HasSwitch(
56 switches::kUseFakeDeviceForMediaStream)) 56 switches::kUseFakeDeviceForMediaStream))
57 << "Must run with fake devices since the test will explicitly look " 57 << "Must run with fake devices since the test will explicitly look "
58 << "for the fake device signal."; 58 << "for the fake device signal.";
59 59
60 MakeTypicalCall(javascript, "/media/peerconnection-call-audio.html"); 60 MakeTypicalCall(javascript, "/media/peerconnection-call-audio.html");
61 } 61 }
62 }; 62 };
63 63
64 // Flaky on Linux. http://crbug.com/733551
65 #if defined(OS_LINUX)
66 #define MAYBE_CanMakeVideoCallAndThenRenegotiateToAudio \
67 DISABLED_CanMakeVideoCallAndThenRenegotiateToAudio
68 #else
69 #define MAYBE_CanMakeVideoCallAndThenRenegotiateToAudio \
70 CanMakeVideoCallAndThenRenegotiateToAudio
71 #endif
64 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioBrowserTest, 72 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioBrowserTest,
65 CanMakeVideoCallAndThenRenegotiateToAudio) { 73 MAYBE_CanMakeVideoCallAndThenRenegotiateToAudio) {
66 MakeAudioDetectingPeerConnectionCall( 74 MakeAudioDetectingPeerConnectionCall(
67 "callAndRenegotiateToAudio({audio: true, video:true}, {audio: true});"); 75 "callAndRenegotiateToAudio({audio: true, video:true}, {audio: true});");
68 } 76 }
69 77
70 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioBrowserTest, 78 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioBrowserTest,
71 EstablishAudioVideoCallAndEnsureAudioIsPlaying) { 79 EstablishAudioVideoCallAndEnsureAudioIsPlaying) {
72 MakeAudioDetectingPeerConnectionCall( 80 MakeAudioDetectingPeerConnectionCall(
73 "callAndEnsureAudioIsPlaying({audio:true, video:true});"); 81 "callAndEnsureAudioIsPlaying({audio:true, video:true});");
74 } 82 }
75 83
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 "callAndEnsureRemoteVideoMutingDoesntMuteAudio();"); 117 "callAndEnsureRemoteVideoMutingDoesntMuteAudio();");
110 } 118 }
111 119
112 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioBrowserTest, 120 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioBrowserTest,
113 EstablishAudioVideoCallAndVerifyUnmutingWorks) { 121 EstablishAudioVideoCallAndVerifyUnmutingWorks) {
114 MakeAudioDetectingPeerConnectionCall( 122 MakeAudioDetectingPeerConnectionCall(
115 "callAndEnsureAudioTrackUnmutingWorks();"); 123 "callAndEnsureAudioTrackUnmutingWorks();");
116 } 124 }
117 125
118 } // namespace content 126 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698