X-Git-Url: http://git.scottworley.com/paperdoorknob/blobdiff_plain/e3ba205699db054723578a32d1bf73276b0e58ad..b03ad5dc018cc85fd5905011d74de1cc4c234cd9:/paperdoorknob_test.py

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index b1d41d4..400570f 100644
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -16,6 +16,9 @@ TIMEOUT = 8
 
 class FakeGlowficHTTPRequestHandler(BaseHTTPRequestHandler):
 
+    def _notify_test(self) -> None:
+        raise NotImplementedError()
+
     def _response_code(self) -> int:
         if self.path == "/not_found":
             return 404
@@ -30,30 +33,44 @@ class FakeGlowficHTTPRequestHandler(BaseHTTPRequestHandler):
         self.send_header("Content-Length", str(len(body)))
         self.end_headers()
         self.wfile.write(body)
+        self._notify_test()
 
 
 class TestFetch(unittest.TestCase):
+    def _port(self) -> int:
+        port = self._web_server.socket.getsockname()[1]
+        assert isinstance(port, int)
+        return port
+
+    def _count_request(self) -> None:
+        self._request_counter += 1
+
     def setUp(self) -> None:
-        web_server = HTTPServer(('', 0), FakeGlowficHTTPRequestHandler)
-        self._port = web_server.socket.getsockname()[1]
-        self._thread = threading.Thread(target=web_server.serve_forever)
+        self._request_counter = 0
+        handler = type("Handler", (FakeGlowficHTTPRequestHandler,), {
+                       '_notify_test': lambda _: self._count_request()})
+        self._web_server = HTTPServer(('', 0), handler)
+        self._thread = threading.Thread(target=self._web_server.serve_forever)
         self._thread.start()
-        self._stop_server = web_server.shutdown
 
     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)
+        self.assertEqual(self._request_counter, 1)
+        paperdoorknob.fetch(f"http://localhost:{self._port()}", TIMEOUT)
+        self.assertEqual(self._request_counter, 2)
 
     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__':