<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[214558] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/214558">214558</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2017-03-29 13:07:42 -0700 (Wed, 29 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>webkitpy: Standardize web-server port definitions
https://bugs.webkit.org/show_bug.cgi?id=170144
<rdar://problem/31284026>
Reviewed by Daniel Bates.
Default web-server ports should be declared in global variables.
Add functions to web-servers which return the ports these servers
are using so that other tools can forward them.
* Scripts/webkitpy/layout_tests/servers/apache_http_server.py:
(LayoutTestApacheHttpd.__init__): Use shared constants in http_server_base.py.
* Scripts/webkitpy/layout_tests/servers/apache_http_server_unittest.py:
(TestLayoutTestApacheHttpd.test_start_cmd): Check port_to_forward for expected values.
* Scripts/webkitpy/layout_tests/servers/http_server.py:
(Lighttpd.__init__): Use shared constants in http_server_base.py.
(Lighttpd._prepare_config): Ditto.
* Scripts/webkitpy/layout_tests/servers/http_server_base.py:
(HttpServerBase): Add default port constants.
(HttpServerBase.ports_to_forward): Add function to return ports used for http server.
* Scripts/webkitpy/layout_tests/servers/http_server_unittest.py:
(TestHttpServer.test_start_cmd): Check port_to_forward for expected values.
* Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:
(WebPlatformTestServer.ports_to_forward): Add function to return ports used for web-platform tests.
* Scripts/webkitpy/layout_tests/servers/websocket_server.py:
(PyWebSocket): Make default port values public.
(PyWebSocket.__init__): Use public default port.
(PyWebSocket.ports_to_forward): Return port used in an array.
* Scripts/webkitpy/port/base.py:
(Port.to.ports_to_forward): Return all ports used the various web-servers managed by the port object.
(Port.to.start_websocket_server): Use PyWebSocket port constants.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsserversapache_http_serverpy">trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsserversapache_http_server_unittestpy">trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsservershttp_serverpy">trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsservershttp_server_basepy">trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsservershttp_server_unittestpy">trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsserversweb_platform_test_serverpy">trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsserverswebsocket_serverpy">trunk/Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportbasepy">trunk/Tools/Scripts/webkitpy/port/base.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (214557 => 214558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-03-29 19:31:35 UTC (rev 214557)
+++ trunk/Tools/ChangeLog 2017-03-29 20:07:42 UTC (rev 214558)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2017-03-29 Jonathan Bedard <jbedard@apple.com>
+
+ webkitpy: Standardize web-server port definitions
+ https://bugs.webkit.org/show_bug.cgi?id=170144
+ <rdar://problem/31284026>
+
+ Reviewed by Daniel Bates.
+
+ Default web-server ports should be declared in global variables.
+ Add functions to web-servers which return the ports these servers
+ are using so that other tools can forward them.
+
+ * Scripts/webkitpy/layout_tests/servers/apache_http_server.py:
+ (LayoutTestApacheHttpd.__init__): Use shared constants in http_server_base.py.
+ * Scripts/webkitpy/layout_tests/servers/apache_http_server_unittest.py:
+ (TestLayoutTestApacheHttpd.test_start_cmd): Check port_to_forward for expected values.
+ * Scripts/webkitpy/layout_tests/servers/http_server.py:
+ (Lighttpd.__init__): Use shared constants in http_server_base.py.
+ (Lighttpd._prepare_config): Ditto.
+ * Scripts/webkitpy/layout_tests/servers/http_server_base.py:
+ (HttpServerBase): Add default port constants.
+ (HttpServerBase.ports_to_forward): Add function to return ports used for http server.
+ * Scripts/webkitpy/layout_tests/servers/http_server_unittest.py:
+ (TestHttpServer.test_start_cmd): Check port_to_forward for expected values.
+ * Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:
+ (WebPlatformTestServer.ports_to_forward): Add function to return ports used for web-platform tests.
+ * Scripts/webkitpy/layout_tests/servers/websocket_server.py:
+ (PyWebSocket): Make default port values public.
+ (PyWebSocket.__init__): Use public default port.
+ (PyWebSocket.ports_to_forward): Return port used in an array.
+ * Scripts/webkitpy/port/base.py:
+ (Port.to.ports_to_forward): Return all ports used the various web-servers managed by the port object.
+ (Port.to.start_websocket_server): Use PyWebSocket port constants.
+
</ins><span class="cx"> 2017-03-29 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Links with empty hrefs should not be drag sources
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsserversapache_http_serverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py (214557 => 214558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py 2017-03-29 19:31:35 UTC (rev 214557)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py 2017-03-29 20:07:42 UTC (rev 214558)
</span><span class="lines">@@ -56,9 +56,9 @@
</span><span class="cx"> if self._port is not None:
</span><span class="cx"> self._mappings = [{'port': self._port}]
</span><span class="cx"> else:
</span><del>- self._mappings = [{'port': 8000},
- {'port': 8080},
- {'port': 8443, 'sslcert': True}]
</del><ins>+ self._mappings = [{'port': self.HTTP_SERVER_PORT},
+ {'port': self.ALTERNATIVE_HTTP_SERVER_PORT},
+ {'port': self.HTTPS_SERVER_PORT, 'sslcert': True}]
</ins><span class="cx"> self._output_dir = output_dir
</span><span class="cx"> self._filesystem.maybe_make_directory(output_dir)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsserversapache_http_server_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server_unittest.py (214557 => 214558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server_unittest.py 2017-03-29 19:31:35 UTC (rev 214557)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server_unittest.py 2017-03-29 20:07:42 UTC (rev 214558)
</span><span class="lines">@@ -57,6 +57,9 @@
</span><span class="cx"> server._check_that_all_ports_are_available = lambda: True
</span><span class="cx"> server._is_server_running_on_all_ports = lambda: True
</span><span class="cx"> server._wait_for_action = fake_pid
</span><ins>+
+ self.assertEqual(server.ports_to_forward(), [8000, 8080, 8443])
+
</ins><span class="cx"> oc = OutputCapture()
</span><span class="cx"> try:
</span><span class="cx"> oc.capture_output()
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsservershttp_serverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py (214557 => 214558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py 2017-03-29 19:31:35 UTC (rev 214557)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py 2017-03-29 20:07:42 UTC (rev 214558)
</span><span class="lines">@@ -75,9 +75,9 @@
</span><span class="cx"> if self._webkit_tests:
</span><span class="cx"> self.VIRTUALCONFIG.extend(
</span><span class="cx"> # Three mappings (one with SSL) for LayoutTests http tests
</span><del>- [{'port': 8000, 'docroot': self._webkit_tests},
- {'port': 8080, 'docroot': self._webkit_tests},
- {'port': 8443, 'docroot': self._webkit_tests,
</del><ins>+ [{'port': self.HTTP_SERVER_PORT, 'docroot': self._webkit_tests},
+ {'port': self.ALTERNATIVE_HTTP_SERVER_PORT, 'docroot': self._webkit_tests},
+ {'port': self.HTTPS_SERVER_PORT, 'docroot': self._webkit_tests,
</ins><span class="cx"> 'sslcert': self._pem_file}])
</span><span class="cx">
</span><span class="cx"> def _prepare_config(self):
</span><span class="lines">@@ -143,9 +143,9 @@
</span><span class="cx">
</span><span class="cx"> # default set of ports as for LayoutTests but with a
</span><span class="cx"> # specified root.
</span><del>- mappings = [{'port': 8000, 'docroot': self._root},
- {'port': 8080, 'docroot': self._root},
- {'port': 8443, 'docroot': self._root,
</del><ins>+ mappings = [{'port': self.HTTP_SERVER_PORT, 'docroot': self._root},
+ {'port': self.ALTERNATIVE_HTTP_SERVER_PORT, 'docroot': self._root},
+ {'port': self.HTTPS_SERVER_PORT, 'docroot': self._root,
</ins><span class="cx"> 'sslcert': self._pem_file}]
</span><span class="cx"> else:
</span><span class="cx"> mappings = self.VIRTUALCONFIG
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsservershttp_server_basepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base.py (214557 => 214558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base.py 2017-03-29 19:31:35 UTC (rev 214557)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base.py 2017-03-29 20:07:42 UTC (rev 214558)
</span><span class="lines">@@ -47,6 +47,10 @@
</span><span class="cx"> class HttpServerBase(object):
</span><span class="cx"> """A skeleton class for starting and stopping servers used by the layout tests."""
</span><span class="cx">
</span><ins>+ HTTP_SERVER_PORT = 8000
+ ALTERNATIVE_HTTP_SERVER_PORT = 8080
+ HTTPS_SERVER_PORT = 8443
+
</ins><span class="cx"> def __init__(self, port_obj):
</span><span class="cx"> self._executive = port_obj._executive
</span><span class="cx"> self._filesystem = port_obj._filesystem
</span><span class="lines">@@ -68,6 +72,9 @@
</span><span class="cx"> self._runtime_path = self._filesystem.join(tmpdir, "WebKit")
</span><span class="cx"> self._filesystem.maybe_make_directory(self._runtime_path)
</span><span class="cx">
</span><ins>+ def ports_to_forward(self):
+ return [mapping['port'] for mapping in self._mappings]
+
</ins><span class="cx"> def start(self):
</span><span class="cx"> """Starts the server. It is an error to start an already started server.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsservershttp_server_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py (214557 => 214558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py 2017-03-29 19:31:35 UTC (rev 214557)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py 2017-03-29 20:07:42 UTC (rev 214558)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> "/mock/one-additional-dir": "/mock-checkout/one-additional-dir",
</span><span class="cx"> "/mock/another-additional-dir": "/mock-checkout/one-additional-dir"})
</span><span class="cx"> self.assertRaises(ServerError, server.start)
</span><ins>+ self.assertEqual(server.ports_to_forward(), [8000, 8080, 8443])
</ins><span class="cx">
</span><span class="cx"> config_file = host.filesystem.read_text_file("/mock/output_dir/lighttpd.conf")
</span><span class="cx"> self.assertEqual(re.findall(r"alias.url.+", config_file), [
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsserversweb_platform_test_serverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py (214557 => 214558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py 2017-03-29 19:31:35 UTC (rev 214557)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py 2017-03-29 20:07:42 UTC (rev 214558)
</span><span class="lines">@@ -97,6 +97,9 @@
</span><span class="cx"> port["sslcert"] = True
</span><span class="cx"> self._mappings.append(port)
</span><span class="cx">
</span><ins>+ def ports_to_forward(self):
+ return [mapping['port'] for mapping in self._mappings]
+
</ins><span class="cx"> def _install_modules(self):
</span><span class="cx"> modules_file_path = self._filesystem.join(self._doc_root_path, "..", "resources", "web-platform-tests-modules.json")
</span><span class="cx"> if not self._filesystem.isfile(modules_file_path):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsserverswebsocket_serverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py (214557 => 214558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py 2017-03-29 19:31:35 UTC (rev 214557)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py 2017-03-29 20:07:42 UTC (rev 214558)
</span><span class="lines">@@ -44,12 +44,11 @@
</span><span class="cx"> _WSS_LOG_NAME = 'pywebsocket.wss.log'
</span><span class="cx">
</span><span class="cx">
</span><del>-_DEFAULT_WS_PORT = 8880
-_DEFAULT_WSS_PORT = 9323
</del><ins>+class PyWebSocket(http_server.Lighttpd):
+ DEFAULT_WS_PORT = 8880
+ DEFAULT_WSS_PORT = 9323
</ins><span class="cx">
</span><del>-
-class PyWebSocket(http_server.Lighttpd):
- def __init__(self, port_obj, output_dir, port=_DEFAULT_WS_PORT,
</del><ins>+ def __init__(self, port_obj, output_dir, port=DEFAULT_WS_PORT,
</ins><span class="cx"> root=None, use_tls=False,
</span><span class="cx"> private_key=None, certificate=None, ca_certificate=None,
</span><span class="cx"> pidfile=None):
</span><span class="lines">@@ -57,7 +56,7 @@
</span><span class="cx"> output_dir: the absolute path to the layout test result directory
</span><span class="cx"> """
</span><span class="cx"> http_server.Lighttpd.__init__(self, port_obj, output_dir,
</span><del>- port=_DEFAULT_WS_PORT,
</del><ins>+ port=PyWebSocket.DEFAULT_WS_PORT,
</ins><span class="cx"> root=root)
</span><span class="cx"> self._output_dir = output_dir
</span><span class="cx"> self._pid_file = pidfile
</span><span class="lines">@@ -107,6 +106,9 @@
</span><span class="cx"> else:
</span><span class="cx"> self._log_prefix = _WS_LOG_NAME
</span><span class="cx">
</span><ins>+ def ports_to_forward(self):
+ return [self._port]
+
</ins><span class="cx"> def _prepare_config(self):
</span><span class="cx"> log_file_name = self._log_prefix
</span><span class="cx"> # FIXME: Doesn't Executive have a devnull, so that we don't have to use os.devnull directly?
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportbasepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/base.py (214557 => 214558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/base.py 2017-03-29 19:31:35 UTC (rev 214557)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2017-03-29 20:07:42 UTC (rev 214558)
</span><span class="lines">@@ -57,8 +57,7 @@
</span><span class="cx"> from webkitpy.port import image_diff
</span><span class="cx"> from webkitpy.port import server_process
</span><span class="cx"> from webkitpy.port.factory import PortFactory
</span><del>-from webkitpy.layout_tests.servers import apache_http_server
-from webkitpy.layout_tests.servers import http_server
</del><ins>+from webkitpy.layout_tests.servers import apache_http_server, http_server
</ins><span class="cx"> from webkitpy.layout_tests.servers import web_platform_test_server
</span><span class="cx"> from webkitpy.layout_tests.servers import websocket_server
</span><span class="cx">
</span><span class="lines">@@ -938,6 +937,18 @@
</span><span class="cx"> storage, it should override this method."""
</span><span class="cx"> pass
</span><span class="cx">
</span><ins>+ def ports_to_forward(self):
+ ports = []
+ if self._http_server:
+ ports.extend(self._http_server.ports_to_forward())
+ if self._websocket_server:
+ ports.extend(self._websocket_server.ports_to_forward())
+ if self._websocket_server:
+ ports.extend(self._websocket_secure_server.ports_to_forward())
+ if self._web_platform_test_server:
+ ports.extend(self._web_platform_test_server.ports_to_forward())
+ return ports
+
</ins><span class="cx"> def start_http_server(self, additional_dirs=None):
</span><span class="cx"> """Start a web server. Raise an error if it can't start or is already running.
</span><span class="cx">
</span><span class="lines">@@ -975,7 +986,7 @@
</span><span class="cx"> self._websocket_server_temporary_directory = websocket_server_temporary_directory
</span><span class="cx"> if self._extract_certificate_from_pem(pem_file, certificate_file) and self._extract_private_key_from_pem(pem_file, private_key_file):
</span><span class="cx"> secure_server = self._websocket_secure_server = websocket_server.PyWebSocket(self, self.results_directory(),
</span><del>- use_tls=True, port=9323, private_key=private_key_file, certificate=certificate_file)
</del><ins>+ use_tls=True, port=websocket_server.PyWebSocket.DEFAULT_WSS_PORT, private_key=private_key_file, certificate=certificate_file)
</ins><span class="cx"> secure_server.start()
</span><span class="cx"> self._websocket_secure_server = secure_server
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>