diff options
| author | grunell@chromium.org <grunell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-30 13:09:20 +0000 |
|---|---|---|
| committer | grunell@chromium.org <grunell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-30 13:09:20 +0000 |
| commit | a492885c22aec36c5674f71a79047ce54a33e54e (patch) | |
| tree | dc30518a2871ffb2dbef52707391cb60b0baec1e | |
| parent | a23ceea794060da3ca9b4c5dbf6484e42c1b207b (diff) | |
| download | chromium_src-a492885c22aec36c5674f71a79047ce54a33e54e.zip chromium_src-a492885c22aec36c5674f71a79047ce54a33e54e.tar.gz chromium_src-a492885c22aec36c5674f71a79047ce54a33e54e.tar.bz2 | |
Disable PPAPINaClPNaClTest.WebSocket2 on XP - flaky.
TBR=dmichael@chromium.org
NOTRY=true
BUG=389084
Review URL: https://codereview.chromium.org/349973012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280592 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/ppapi/ppapi_browsertest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc index 32fdba1..a0b83e8 100644 --- a/chrome/test/ppapi/ppapi_browsertest.cc +++ b/chrome/test/ppapi/ppapi_browsertest.cc @@ -1028,7 +1028,13 @@ IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket2)) { IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, WebSocket1) { RUN_WEBSOCKET_SUBTESTS_1; } -IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, WebSocket2) { +// Flaky on XP Tests (3): http://crbug.com/389084 +#if defined(OS_WIN) +#define MAYBE_WebSocket2 DISABLED_WebSocket2 +#else +#define MAYBE_WebSocket2 WebSocket2 +#endif +IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, MAYBE_WebSocket2) { RUN_WEBSOCKET_SUBTESTS_2; } IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, |