diff options
| author | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 16:37:58 +0000 |
|---|---|---|
| committer | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 16:37:58 +0000 |
| commit | e056f5f20b3c53941adbaa045ddadafe8e47bf4e (patch) | |
| tree | 490a56eac2c9768a592ba50fc2b10cd58d3842d1 | |
| parent | 56432b010b5e2ed63df0c29947091d08c86db355 (diff) | |
| download | chromium_src-e056f5f20b3c53941adbaa045ddadafe8e47bf4e.zip chromium_src-e056f5f20b3c53941adbaa045ddadafe8e47bf4e.tar.gz chromium_src-e056f5f20b3c53941adbaa045ddadafe8e47bf4e.tar.bz2 | |
Disable flaky interactive_ui_test on OSX
PPAPINaClTest.WebSocket_CcInterfaces is intermittently failing on OSX
BUG=111636
TEST=none
TBR=toyoshim
Review URL: https://chromiumcodereview.appspot.com/9297020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119458 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/ui/ppapi_uitest.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc index b54659b..034da4f 100644 --- a/chrome/test/ui/ppapi_uitest.cc +++ b/chrome/test/ui/ppapi_uitest.cc @@ -689,6 +689,13 @@ TEST_PPAPI_OUT_OF_PROCESS(Flash_MessageLoop) TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset) TEST_PPAPI_OUT_OF_PROCESS(Flash_GetCommandLineArgs) +// Intermittently fails on OSX. http://crbug.com/111636 +#if defined(OS_MAXOSX) +#define MAYBE_WebSocket_CcInterfaces FLAKY_WebSocket_CcInterfaces +#else +#define MAYBE_WebSocket_CcInterfaces WebSocket_CcInterfaces +#endif + TEST_PPAPI_IN_PROCESS(WebSocket_IsWebSocket) TEST_PPAPI_IN_PROCESS(WebSocket_UninitializedPropertiesAccess) TEST_PPAPI_IN_PROCESS(WebSocket_InvalidConnect) @@ -701,7 +708,7 @@ TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_GetProtocol) TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_TextSendReceive) TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_BinarySendReceive) TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_BufferedAmount) -TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_CcInterfaces) +TEST_PPAPI_IN_PROCESS_WITH_WS(MAYBE_WebSocket_CcInterfaces) TEST_PPAPI_NACL_VIA_HTTP(WebSocket_IsWebSocket) TEST_PPAPI_NACL_VIA_HTTP(WebSocket_UninitializedPropertiesAccess) TEST_PPAPI_NACL_VIA_HTTP(WebSocket_InvalidConnect) @@ -714,7 +721,7 @@ TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_GetProtocol) TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_TextSendReceive) TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_BinarySendReceive) TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_BufferedAmount) -TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_CcInterfaces) +TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(MAYBE_WebSocket_CcInterfaces) TEST_PPAPI_IN_PROCESS(AudioConfig_ValidConfigs) TEST_PPAPI_IN_PROCESS(AudioConfig_InvalidConfigs) |