summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-12 07:59:55 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-12 07:59:55 +0000
commit3ef89fc21e19032c3b14e987abd2f33e5ed47164 (patch)
tree7fcfbf9c25d8f281dfbf25e74d276a25e0ba2ef1 /content/browser
parent26a1323c4ddd2c1a0af83ba6f8dc1f3c282df498 (diff)
downloadchromium_src-3ef89fc21e19032c3b14e987abd2f33e5ed47164.zip
chromium_src-3ef89fc21e19032c3b14e987abd2f33e5ed47164.tar.gz
chromium_src-3ef89fc21e19032c3b14e987abd2f33e5ed47164.tar.bz2
Disable WebrtcBrowserTest.CallWithDataAndLaterAddMedia on Linux as it flakily crashes
BUG=175683 TBR=perkj@chromium.org Review URL: https://codereview.chromium.org/12218115 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181895 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/media/webrtc_browsertest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/content/browser/media/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc
index 1e43591..cd227dd 100644
--- a/content/browser/media/webrtc_browsertest.cc
+++ b/content/browser/media/webrtc_browsertest.cc
@@ -114,7 +114,13 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataAndMedia) {
// This test will make a PeerConnection-based call and test an unreliable text
// dataChannel and later add an audio and video track.
-IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataAndLaterAddMedia) {
+#if defined(OS_LINUX)
+// Flaky on Linux. http://crbug.com/175683
+#define MAYBE_CallWithDataAndLaterAddMedia DISABLED_CallWithDataAndLaterAddMedia
+#else
+#define MAYBE_CallWithDataAndLaterAddMedia CallWithDataAndLaterAddMedia
+#endif
+IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CallWithDataAndLaterAddMedia) {
GURL url(test_server()->GetURL("files/media/peerconnection-call.html"));
NavigateToURL(shell(), url);