diff options
| author | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-04 07:24:16 +0000 |
|---|---|---|
| committer | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-04 07:24:16 +0000 |
| commit | fc4c93128e29280ea1e8d25a41a8662460a78f0a (patch) | |
| tree | ddb8c897af198bff721a99cc17f47011448fc6c7 /chrome | |
| parent | e230ae4c0a49e32b20b6aec33b234252d0f8253b (diff) | |
| download | chromium_src-fc4c93128e29280ea1e8d25a41a8662460a78f0a.zip chromium_src-fc4c93128e29280ea1e8d25a41a8662460a78f0a.tar.gz chromium_src-fc4c93128e29280ea1e8d25a41a8662460a78f0a.tar.bz2 | |
Fix for websocket tests move under http/tests
websocket layout tests has been moved under http/tests/websocket/tests.
We need to checkout these directory under src/chrome/test/data/layout_tests/LayoutTests for worker tests and extension api tests.
Fix test path for worker tests.
BUG=57662
TEST=trybot
Review URL: http://codereview.chromium.org/3581010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61350 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/extensions/extension_websocket_apitest.cc | 3 | ||||
| -rw-r--r-- | chrome/test/ui_test_utils.h | 2 | ||||
| -rw-r--r-- | chrome/worker/worker_uitest.cc | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_websocket_apitest.cc b/chrome/browser/extensions/extension_websocket_apitest.cc index 7b9f02a..227a01a 100644 --- a/chrome/browser/extensions/extension_websocket_apitest.cc +++ b/chrome/browser/extensions/extension_websocket_apitest.cc @@ -15,8 +15,7 @@ #else #define MAYBE_WebSocket WebSocket #endif -// This test is disabled because of http://crbug.com/57662. -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_WebSocket) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_WebSocket) { FilePath websocket_root_dir; PathService::Get(chrome::DIR_TEST_DATA, &websocket_root_dir); websocket_root_dir = websocket_root_dir.AppendASCII("layout_tests") diff --git a/chrome/test/ui_test_utils.h b/chrome/test/ui_test_utils.h index 75e38a2..591c3f8 100644 --- a/chrome/test/ui_test_utils.h +++ b/chrome/test/ui_test_utils.h @@ -266,7 +266,7 @@ class TimedMessageLoopRunner { // // third_paty/WebKit/WebKitTools/Scripts/new-run-webkit-websocketserver // -// Only *_wsh.py handlers found under "websocket/tests" from the +// Only *_wsh.py handlers found under "http/tests/websocket/tests" from the // |root_directory| will be found and active while running the test // server. class TestWebSocketServer { diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc index e92dea5c..21ba6cf 100644 --- a/chrome/worker/worker_uitest.cc +++ b/chrome/worker/worker_uitest.cc @@ -431,12 +431,16 @@ TEST_F(WorkerTest, FLAKY_WorkerWebSocketLayoutTests) { }; FilePath websocket_test_dir; + websocket_test_dir = websocket_test_dir.AppendASCII("http"); + websocket_test_dir = websocket_test_dir.AppendASCII("tests"); websocket_test_dir = websocket_test_dir.AppendASCII("websocket"); websocket_test_dir = websocket_test_dir.AppendASCII("tests"); FilePath worker_test_dir; worker_test_dir = worker_test_dir.AppendASCII("workers"); InitializeForLayoutTest(websocket_test_dir, worker_test_dir, kWebSocketPort); + test_case_dir_ = test_case_dir_.AppendASCII("http"); + test_case_dir_ = test_case_dir_.AppendASCII("tests"); test_case_dir_ = test_case_dir_.AppendASCII("websocket"); test_case_dir_ = test_case_dir_.AppendASCII("tests"); test_case_dir_ = test_case_dir_.AppendASCII("workers"); |