Skip to content

GitLab

T
tangled
Commit 17f92cd3 authored by phoglund's avatar phoglund Committed by Commit bot
Browse files
Options

Re-enabling fixed WebRTC browser tests. 

BUG=417756

Review URL: https://codereview.chromium.org/620133002

Cr-Commit-Position: refs/heads/master@{#299083}
parent cd57f928
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 7 deletions
content/browser/media/webrtc_browsertest.cc
View file @ 17f92cd3
...@@ -197,19 +197,14 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, ...@@ -197,19 +197,14 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest,
// The stream sent from pc3 to pc4 is the stream received on pc1. // The stream sent from pc3 to pc4 is the stream received on pc1.
// The stream sent from pc4 to pc3 is cloned from stream the stream received // The stream sent from pc4 to pc3 is cloned from stream the stream received
// on pc2. // on pc2.
// Flaky on win xp. http://crbug.com/304775 #if defined(THREAD_SANITIZER)
#if defined(OS_WIN) // Flaky on TSAN v2. http://crbug.com/373637
#define MAYBE_CanForwardRemoteStream DISABLED_CanForwardRemoteStream #define MAYBE_CanForwardRemoteStream DISABLED_CanForwardRemoteStream
#define MAYBE_CanForwardRemoteStream720p DISABLED_CanForwardRemoteStream720p #define MAYBE_CanForwardRemoteStream720p DISABLED_CanForwardRemoteStream720p
#else #else
#define MAYBE_CanForwardRemoteStream CanForwardRemoteStream #define MAYBE_CanForwardRemoteStream CanForwardRemoteStream
// Flaky on TSAN v2. http://crbug.com/373637
#if defined(THREAD_SANITIZER)
#define MAYBE_CanForwardRemoteStream720p DISABLED_CanForwardRemoteStream720p
#else
#define MAYBE_CanForwardRemoteStream720p CanForwardRemoteStream720p #define MAYBE_CanForwardRemoteStream720p CanForwardRemoteStream720p
#endif #endif
#endif
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, MAYBE_CanForwardRemoteStream) { IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, MAYBE_CanForwardRemoteStream) {
#if defined (OS_ANDROID) #if defined (OS_ANDROID)
// This test fails on Nexus 5 devices. // This test fails on Nexus 5 devices.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment