Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2046)

Unified Diff: webkit/tools/layout_tests/run_webkit_tests.py

Issue 385131: Fix websocket tests to run. (Closed)
Patch Set: Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/tools/layout_tests/run_webkit_tests.py
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py
index 7004631a64b6afc54f237dba779cb8b8733820c7..16cc01c5c28c7e80147d665d2911bdf1845b3645 100755
--- a/webkit/tools/layout_tests/run_webkit_tests.py
+++ b/webkit/tools/layout_tests/run_webkit_tests.py
@@ -131,8 +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)
+ # disable wss server. need to install pyOpenSSL on buildbots.
+ # self._websocket_secure_server = websocket_server.PyWebSocket(
+ # options.results_directory, use_tls=True, port=9323)
# a list of TestType objects
self._test_types = []
@@ -152,7 +153,7 @@ class TestRunner:
self._http_server.Stop()
# Stop the Web Socket / Web Socket Secure servers.
self._websocket_server.Stop()
- self._websocket_secure_server.Stop()
+ # self._websocket_secure_server.Stop()
def GatherFilePaths(self, paths):
"""Find all the files to test.
@@ -464,7 +465,7 @@ class TestRunner:
# Start Web Socket server.
if (self._ContainWebSocketTest(test_files)):
self._websocket_server.Start()
- self._websocket_secure_server.Start()
+ # self._websocket_secure_server.Start()
# Instantiate TestShellThreads and start them.
threads = []
« no previous file with comments | « webkit/tools/layout_tests/layout_package/websocket_server.py ('k') | webkit/tools/layout_tests/test_expectations.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698