diff options
| author | yuzo@chromium.org <yuzo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-16 05:42:44 +0000 |
|---|---|---|
| committer | yuzo@chromium.org <yuzo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-16 05:42:44 +0000 |
| commit | 36cd42f16e38b8ed0133d71f503848b4577d402f (patch) | |
| tree | ded960ca991beaff02d51038bc00738d0682f99b /webkit/tools | |
| parent | 5ceeeae9fd67e4a5bfbec01c0b89bc15460c18dc (diff) | |
| download | chromium_src-36cd42f16e38b8ed0133d71f503848b4577d402f.zip chromium_src-36cd42f16e38b8ed0133d71f503848b4577d402f.tar.gz chromium_src-36cd42f16e38b8ed0133d71f503848b4577d402f.tar.bz2 | |
Start/stop Web Socket Secure server if necessary.
This change requires http://codereview.chromium.org/273035.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/264058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29252 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rwxr-xr-x | webkit/tools/layout_tests/run_webkit_tests.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py index 2f617e1..5231b2f 100755 --- a/webkit/tools/layout_tests/run_webkit_tests.py +++ b/webkit/tools/layout_tests/run_webkit_tests.py @@ -131,6 +131,9 @@ class TestRunner: self._http_server = http_server.Lighttpd(options.results_directory) self._websocket_server = websocket_server.PyWebSocket( options.results_directory) + self._websocket_secure_server = websocket_server.PyWebSocket( + options.results_directory, use_tls=True, port=9323) + # a list of TestType objects self._test_types = [] @@ -147,8 +150,9 @@ class TestRunner: logging.info("stopping http server") # Stop the http server. self._http_server.Stop() - # Stop the Web Socket server. + # Stop the Web Socket / Web Socket Secure servers. self._websocket_server.Stop() + self._websocket_secure_server.Stop() def GatherFilePaths(self, paths): """Find all the files to test. @@ -460,6 +464,7 @@ class TestRunner: # Start Web Socket server. if (self._ContainWebSocketTest(test_files)): self._websocket_server.Start() + self._websocket_secure_server.Start() # Instantiate TestShellThreads and start them. threads = [] |