diff options
| author | ojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 01:39:04 +0000 |
|---|---|---|
| committer | ojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 01:39:04 +0000 |
| commit | 3280913d013d81fa0a5cfdbfb1efedbbe8dd3a7a (patch) | |
| tree | 81e93e75a843689d306a8da378171e7d36f866f9 /webkit | |
| parent | c7ad513925884748b43d1746a1f0c61811c3f6ec (diff) | |
| download | chromium_src-3280913d013d81fa0a5cfdbfb1efedbbe8dd3a7a.zip chromium_src-3280913d013d81fa0a5cfdbfb1efedbbe8dd3a7a.tar.gz chromium_src-3280913d013d81fa0a5cfdbfb1efedbbe8dd3a7a.tar.bz2 | |
Move the starting of the websocket server next to the starting of the
http server. This should have moved in the previous patch
adding retry of unexpected failures. As it is here, if a websocket
test needs retrying, the an exception will be thrown because the
websocket server is already running from the original test run.
Review URL: http://codereview.chromium.org/435035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33025 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rwxr-xr-x | webkit/tools/layout_tests/run_webkit_tests.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py index 50f6c46..106b1c4 100755 --- a/webkit/tools/layout_tests/run_webkit_tests.py +++ b/webkit/tools/layout_tests/run_webkit_tests.py @@ -458,11 +458,6 @@ class TestRunner: filename_queue = self._GetTestFileQueue(test_files) - # Start Web Socket server. - if (self._ContainWebSocketTest(test_files)): - self._websocket_server.Start() - # self._websocket_secure_server.Start() - # Instantiate TestShellThreads and start them. threads = [] for i in xrange(int(self._options.num_test_shells)): @@ -585,6 +580,11 @@ class TestRunner: or self._options.randomize_order): self._http_server.Start() + # Start Web Socket server. + if (self._ContainWebSocketTest(self._test_files_list)): + self._websocket_server.Start() + # self._websocket_secure_server.Start() + original_failures, thread_timings, test_timings, individual_test_timings = ( self._RunTests(test_shell_binary, self._test_files_list)) |