diff options
| author | yhirano@chromium.org <yhirano@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-24 04:49:23 +0000 |
|---|---|---|
| committer | yhirano@chromium.org <yhirano@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-24 04:49:23 +0000 |
| commit | b7b2c9d0dc5f35c9d0796dc78e6993274cfe4110 (patch) | |
| tree | 37d42acb1282e4ebb1ef5ddebc3cdb98e43556ca /chrome/browser/net/websocket_browsertest.cc | |
| parent | e10fbf1a880c936bee0ad4fff1daf4441794790a (diff) | |
| download | chromium_src-b7b2c9d0dc5f35c9d0796dc78e6993274cfe4110.zip chromium_src-b7b2c9d0dc5f35c9d0796dc78e6993274cfe4110.tar.gz chromium_src-b7b2c9d0dc5f35c9d0796dc78e6993274cfe4110.tar.bz2 | |
[WebSocket] Fix and enable flaky browser test.
Fix and enable WebSocketBrowserTest.SecureWebSocketSplitRecords because
Updating pywebsocket fixes the flakiness.
BUG=176867
R=tyoshino
Review URL: https://codereview.chromium.org/205963002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258874 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/websocket_browsertest.cc')
| -rw-r--r-- | chrome/browser/net/websocket_browsertest.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/chrome/browser/net/websocket_browsertest.cc b/chrome/browser/net/websocket_browsertest.cc index 27bf3f9..58605de 100644 --- a/chrome/browser/net/websocket_browsertest.cc +++ b/chrome/browser/net/websocket_browsertest.cc @@ -60,15 +60,7 @@ IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, WebSocketSplitSegments) { EXPECT_TRUE(EqualsASCII(result, "PASS")); } -// Test that the browser can handle a WebSocket frame split into multiple SSL -// records. This test is flaky on Linux; see http://crbug.com/176867. -#if defined(OS_LINUX) -#define MAYBE_SecureWebSocketSplitRecords DISABLED_SecureWebSocketSplitRecords -#else -#define MAYBE_SecureWebSocketSplitRecords SecureWebSocketSplitRecords -#endif -IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, - MAYBE_SecureWebSocketSplitRecords) { +IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, SecureWebSocketSplitRecords) { // Launch a secure WebSocket server. ASSERT_TRUE(wss_server_.Start()); |