WebSocket test server migration on browser_tests

net/tools/testserver/testserver.py

Index: net/tools/testserver/testserver.py
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py
index 55bca1e039acb3fcd857a047a080e69e3f8f9ce8..98ef526574c76b6f7db089433a8eb2123489d8f2 100755
--- a/net/tools/testserver/testserver.py
+++ b/net/tools/testserver/testserver.py
@@ -84,10 +84,10 @@ class WebSocketOptions:
     self.allow_draft75 = False
     self.strict = True
 
-    # TODO(toyoshim): Support SSL and authenticates (http://crbug.com/137639)
     self.use_tls = False
     self.private_key = None
     self.certificate = None
+    self.tls_client_auth = False
     self.tls_client_ca = None
     self.use_basic_auth = False
 
@@ -2252,7 +2252,12 @@ def main(options, args):
     # TODO(toyoshim): Remove following os.chdir. Currently this operation
     # is required to work correctly. It should be fixed from pywebsocket side.
     os.chdir(MakeDataDir())
-    server = WebSocketServer(WebSocketOptions(host, port, MakeDataDir()))
+    option = WebSocketOptions(host, port, '.')
+    if options.cert_and_key_file:
+      option.use_tls = True
+      option.private_key = options.cert_and_key_file
+      option.certificate = options.cert_and_key_file

[Ryan Sleevi, 2012/10/10 17:59:57]

I'm not sure this change is correct, combined with the change to the test server
to check UsingSSL.

For example, you're ignoring options like ocsp, and you're not performing the
same checks that the HTTP side does (eg: lines 2189-2195)

Can you please try to keep parity between what the C++ side sends and what the
Python side can handle (and to make sure the Python handling is consistent)

[Takashi Toyoshima, 2012/10/11 05:53:28]

As you said, currently testserver.py doesn't support ocsp and client cert for
WebSocket.
I'll fix C++ side to limit arguments.

+    server = WebSocketServer(option)
     print 'WebSocket server started on %s:%d...' % (host, server.server_port)
     server_data['port'] = server.server_port
   elif options.server_type == SERVER_SYNC: