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

Side by Side Diff: content/browser/media/webrtc_browsertest.cc

Issue 12218115: Disable WebrtcBrowserTest.CallWithDataAndLaterAddMedia on Linux as it flakily crashes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 | Annotate | Revision Log
« 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/utf_string_conversions.h" 6 #include "base/utf_string_conversions.h"
7 #include "content/browser/web_contents/web_contents_impl.h" 7 #include "content/browser/web_contents/web_contents_impl.h"
8 #include "content/public/common/content_switches.h" 8 #include "content/public/common/content_switches.h"
9 #include "content/public/test/browser_test_utils.h" 9 #include "content/public/test/browser_test_utils.h"
10 #include "content/shell/shell.h" 10 #include "content/shell/shell.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataAndMedia) { 107 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataAndMedia) {
108 GURL url(test_server()->GetURL("files/media/peerconnection-call.html")); 108 GURL url(test_server()->GetURL("files/media/peerconnection-call.html"));
109 NavigateToURL(shell(), url); 109 NavigateToURL(shell(), url);
110 110
111 EXPECT_TRUE(ExecuteJavascript("callWithDataAndMedia();")); 111 EXPECT_TRUE(ExecuteJavascript("callWithDataAndMedia();"));
112 ExpectTitle("OK"); 112 ExpectTitle("OK");
113 } 113 }
114 114
115 // This test will make a PeerConnection-based call and test an unreliable text 115 // This test will make a PeerConnection-based call and test an unreliable text
116 // dataChannel and later add an audio and video track. 116 // dataChannel and later add an audio and video track.
117 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataAndLaterAddMedia) { 117 #if defined(OS_LINUX)
118 // Flaky on Linux. http://crbug.com/175683
119 #define MAYBE_CallWithDataAndLaterAddMedia DISABLED_CallWithDataAndLaterAddMedia
120 #else
121 #define MAYBE_CallWithDataAndLaterAddMedia CallWithDataAndLaterAddMedia
122 #endif
123 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CallWithDataAndLaterAddMedia) {
118 GURL url(test_server()->GetURL("files/media/peerconnection-call.html")); 124 GURL url(test_server()->GetURL("files/media/peerconnection-call.html"));
119 NavigateToURL(shell(), url); 125 NavigateToURL(shell(), url);
120 126
121 EXPECT_TRUE(ExecuteJavascript("callWithDataAndLaterAddMedia();")); 127 EXPECT_TRUE(ExecuteJavascript("callWithDataAndLaterAddMedia();"));
122 ExpectTitle("OK"); 128 ExpectTitle("OK");
123 } 129 }
124 130
125 } // namespace content 131 } // namespace content
126 132
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