diff options
| author | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 01:04:15 +0000 |
|---|---|---|
| committer | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 01:04:15 +0000 |
| commit | 8913c612cb97d1875ff56e70660e6609dab17505 (patch) | |
| tree | 71ec577458f3ae3aca29a15bb0b7090fd68a49ae /chrome/browser/extensions/extension_websocket_apitest.cc | |
| parent | 79f0ccca9c37c37863f5f1290201682fab4803c5 (diff) | |
| download | chromium_src-8913c612cb97d1875ff56e70660e6609dab17505.zip chromium_src-8913c612cb97d1875ff56e70660e6609dab17505.tar.gz chromium_src-8913c612cb97d1875ff56e70660e6609dab17505.tar.bz2 | |
Enable ExtensionApiTest.WebSocket with using a random port for WebSocket server
This test was flaky. It must come from the server port confliction.
Now, other WebSocket tests use a random port for WebSocket server.
This test also must follow them.
BUG=118460
TEST=browser_tests --gtest_filter='ExtensionApiTest.WebSocket'
Review URL: http://codereview.chromium.org/9716001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127596 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_websocket_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_websocket_apitest.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extension_websocket_apitest.cc b/chrome/browser/extensions/extension_websocket_apitest.cc index 9157117..8dd17eb 100644 --- a/chrome/browser/extensions/extension_websocket_apitest.cc +++ b/chrome/browser/extensions/extension_websocket_apitest.cc @@ -5,14 +5,11 @@ #include "base/path_service.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/common/chrome_paths.h" -#include "chrome/test/base/ui_test_utils.h" #include "net/base/mock_host_resolver.h" -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_WebSocket) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebSocket) { FilePath websocket_root_dir; ASSERT_TRUE(PathService::Get(chrome::DIR_LAYOUT_TESTS, &websocket_root_dir)); - - ui_test_utils::TestWebSocketServer server; - ASSERT_TRUE(server.Start(websocket_root_dir)); + ASSERT_TRUE(StartWebSocketServer(websocket_root_dir)); ASSERT_TRUE(RunExtensionTest("websocket")) << message_; } |