comments

Author: brendandahl

test/common.py

@@ -2210,10 +2210,10 @@ def get_zlib_library(self, cmake):
     return rtn
 
 
-# Run a server and a web page. When a test runs, we tell the server about it,
+# Create a server and a web page. When a test runs, we tell the server about it,
 # which tells the web page, which then opens a window with the test. Doing
 # it this way then allows the page to close() itself when done.
-def harness_server_func(in_queue, out_queue, port):
+def make_test_server(in_queue, out_queue, port):
   class TestServerHandler(SimpleHTTPRequestHandler):
     # Request header handler for default do_GET() path in
     # SimpleHTTPRequestHandler.do_GET(self) below.
@@ -2394,20 +2394,16 @@ def log_request(code=0, size=0):
 
 class HttpServerThread(threading.Thread):
   """A generic thread class to create and run an http server."""
-  def __init__(self, server_creator, *server_args):
+  def __init__(self, server):
     super().__init__()
-    self.server = None
-    self.server_creator = server_creator
-    self.server_args = server_args
+    self.server = server
 
   def stop(self):
     """Shuts down the server if it is running."""
-    if self.server:
-      self.server.shutdown()
+    self.server.shutdown()
 
   def run(self):
     """Creates the server instance and serves forever until stop() is called."""
-    self.server = self.server_creator(*self.server_args)
     # Start the server's main loop (this blocks until shutdown() is called)
     self.server.serve_forever()
 
@@ -2504,7 +2500,7 @@ def setUpClass(cls):
 
     cls.harness_in_queue = queue.Queue()
     cls.harness_out_queue = queue.Queue()
-    cls.harness_server = HttpServerThread(harness_server_func, cls.harness_in_queue, cls.harness_out_queue, cls.PORT)
+    cls.harness_server = HttpServerThread(make_test_server(cls.harness_in_queue, cls.harness_out_queue, cls.PORT))
     cls.harness_server.start()
 
     print(f'[Browser harness server on thread {cls.harness_server.name}]')

test/test_browser.py

@@ -31,7 +31,7 @@
 from tools.utils import delete_dir
 
 
-def test_chunked_synchronous_xhr_server(support_byte_ranges, data, port):
+def make_test_chunked_synchronous_xhr_server(support_byte_ranges, data, port):
   class ChunkedServerHandler(BaseHTTPRequestHandler):
     num_get_connections = 0
 
@@ -1706,7 +1706,7 @@ def test_chunked_synchronous_xhr(self):
     data = os.urandom(10 * chunkSize + 1) # 10 full chunks and one 1 byte chunk
     checksum = zlib.adler32(data) & 0xffffffff # Python 2 compatibility: force bigint
 
-    server = HttpServerThread(test_chunked_synchronous_xhr_server, True, data, self.PORT)
+    server = HttpServerThread(make_test_chunked_synchronous_xhr_server(True, data, self.PORT))
     server.start()
 
     # block until the server is actually ready