Fix websocket tests to run.

Need to set register_cygwin.
Disbale wss server for now.  We need to install pyOpenSSL on buildbots
and we don't have any tests that requires wss now.

BUG=27556
TEST=layout_* bots succeed

Review URL: http://codereview.chromium.org/385131

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32040 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 13 insertions, 7 deletions

diff --git a/webkit/tools/layout_tests/layout_package/websocket_server.py b/webkit/tools/layout_tests/layout_package/websocket_server.py
index 8df66f0..054f087 100644
--- a/webkit/tools/layout_tests/layout_package/websocket_server.py
+++ b/webkit/tools/layout_tests/layout_package/websocket_server.py
@@ -45,10 +45,13 @@ class PyWebSocket(http_server.Lighttpd):
   def __init__(self, output_dir, port=_DEFAULT_WS_PORT,
                use_tls=False,
                private_key=http_server.Lighttpd._pem_file,
-               certificate=http_server.Lighttpd._pem_file):
+               certificate=http_server.Lighttpd._pem_file,
+               register_cygwin=None):
     """Args:
       output_dir: the absolute path to the layout test result directory
     """
+    http_server.Lighttpd.__init__(self, output_dir, port=port,
+                                  register_cygwin=register_cygwin)
     self._output_dir = output_dir
     self._process = None
     self._port = port
@@ -163,6 +166,9 @@ if '__main__' == __name__:
                            default='', help='TLS private key file.')
   option_parser.add_option('-c', '--certificate', dest='certificate',
                            default='', help='TLS certificate file.')
+  option_parser.add_option('--register_cygwin', action="store_true",
+                           dest="register_cygwin",
+                           help='Register Cygwin paths (on Win try bots)')
   options, args = option_parser.parse_args()
 
   if not options.port:
@@ -177,6 +183,7 @@ if '__main__' == __name__:
     kwds['private_key'] = options.private_key
   if options.certificate:
     kwds['certificate'] = options.certificate
+  kwds['register_cygwin'] = options.register_cygwin
 
   pywebsocket = PyWebSocket(tempfile.gettempdir(), **kwds)
   pywebsocket.Start()
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py
index 7004631..16cc01c 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 = []
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 1a39c8c..2ed9e57 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3070,8 +3070,6 @@ BUG27551 WIN : LayoutTests/fast/css/shadow-multiple.html = IMAGE
 // WebKit merge 50756:50820, possibly due to WebKit r50808/r50786 and Chromium r31715
 BUG27553 WIN MAC : LayoutTests/fast/text/atsui-partial-selection.html = IMAGE
 
-BUG27556 SKIP WIN LINUX : LayoutTests/websocket/tests = FAIL
-
 // WebKit merge 50840:50929
 BUG27555 : LayoutTests/accessibility/document-attributes.html = TEXT
 BUG27555 : LayoutTests/fast/forms/file-input-direction.html = TEXT