Commit ed1e69df authored by kjellander's avatar kjellander Committed by Commit bot

Revert of Disabling failing tests in WebRtcApprtcBrowserTest (patchset #2...

Revert of Disabling failing tests in WebRtcApprtcBrowserTest (patchset #2 id:20001 of https://codereview.chromium.org/1016693002/)

Reason for revert:
We have landed an update to the AppRTC app in https://codereview.chromium.org/1023683002/ now, so these tests should now work.

Original issue's description:
> Disabling failing tests in WebRtcApprtcBrowserTest.
>
> These tests will be enabled again once the AppRTC app is working again which we expect will happen rather soon.
>
> TBR=phoglund
> BUG=467471
>
> Committed: https://crrev.com/15103a5ff0f262c85309d4b6af957d7c089aab3d
> Cr-Commit-Position: refs/heads/master@{#320883}

TBR=phoglund@chromium.org,henrika@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=467471

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

Cr-Commit-Position: refs/heads/master@{#321527}
parent 504b1da3
...@@ -232,9 +232,7 @@ class WebRtcApprtcBrowserTest : public WebRtcTestBase { ...@@ -232,9 +232,7 @@ class WebRtcApprtcBrowserTest : public WebRtcTestBase {
base::Process collider_server_; base::Process collider_server_;
}; };
// Disabling while the AppRTC application is being fixed. IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, MANUAL_WorksOnApprtc) {
// See crbug.com/467471 for details.
IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, DISABLED_MANUAL_WorksOnApprtc) {
// Disabled on Win XP: http://code.google.com/p/webrtc/issues/detail?id=2703. // Disabled on Win XP: http://code.google.com/p/webrtc/issues/detail?id=2703.
if (OnWinXp()) if (OnWinXp())
return; return;
...@@ -265,9 +263,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, DISABLED_MANUAL_WorksOnApprtc) { ...@@ -265,9 +263,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, DISABLED_MANUAL_WorksOnApprtc) {
} }
#if defined(OS_LINUX) #if defined(OS_LINUX)
// Disabling while the AppRTC application is being fixed. #define MAYBE_MANUAL_FirefoxApprtcInteropTest MANUAL_FirefoxApprtcInteropTest
// See crbug.com/467471 for details.
#define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInteropTest
#else #else
// Not implemented yet on Windows and Mac. // Not implemented yet on Windows and Mac.
#define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInteropTest #define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInteropTest
......
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