fetch: test: Explicitly close webserver

[paperdoorknob] / paperdoorknob_test.py

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index fafd1c37284c80486f0859aa33c39e0e2728153d..c2fce2b5083c9f1d655ae8b9eb6e0fc25da6dd0c 100644 (file)
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -33,25 +33,31 @@ class FakeGlowficHTTPRequestHandler(BaseHTTPRequestHandler):
 
 
 class TestFetch(unittest.TestCase):
+    def _port(self) -> int:
+        port = self._web_server.socket.getsockname()[1]
+        assert isinstance(port, int)
+        return port
+
     def setUp(self) -> None:
-        web_server = HTTPServer(('', 0), FakeGlowficHTTPRequestHandler)
-        self._port = web_server.socket.getsockname()[1]
-        threading.Thread(target=web_server.serve_forever).start()
-        self._stop_server = web_server.shutdown
+        self._web_server = HTTPServer(('', 0), FakeGlowficHTTPRequestHandler)
+        self._thread = threading.Thread(target=self._web_server.serve_forever)
+        self._thread.start()
 
     def tearDown(self) -> None:
-        self._stop_server()
+        self._web_server.shutdown()
+        self._thread.join()
+        self._web_server.server_close()
 
     def testFetch(self) -> None:
-        paperdoorknob.fetch(f"http://localhost:{self._port}", TIMEOUT)
+        paperdoorknob.fetch(f"http://localhost:{self._port()}", TIMEOUT)
 
     def testFetchErrors(self) -> None:
         with self.assertRaises(requests.HTTPError):
             paperdoorknob.fetch(
-                f"http://localhost:{self._port}/not_found", TIMEOUT)
+                f"http://localhost:{self._port()}/not_found", TIMEOUT)
         with self.assertRaises(requests.HTTPError):
             paperdoorknob.fetch(
-                f"http://localhost:{self._port}/server_error", TIMEOUT)
+                f"http://localhost:{self._port()}/server_error", TIMEOUT)
 
 
 if __name__ == '__main__':