fetch: test: Explicitly close webserver

[paperdoorknob] / paperdoorknob_test.py
diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py

index 2bd354419c113d8d6e321bb8395278879ea65dcc..c2fce2b5083c9f1d655ae8b9eb6e0fc25da6dd0c 100644 (file)
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -8,6 +8,7 @@
  import unittest
  import threading
  from http.server import BaseHTTPRequestHandler, HTTPServer
+import requests
  import paperdoorknob
  
  TIMEOUT = 8
@@ -15,9 +16,16 @@ TIMEOUT = 8
  
  class FakeGlowficHTTPRequestHandler(BaseHTTPRequestHandler):
  
+    def _response_code(self) -> int:
+        if self.path == "/not_found":
+            return 404
+        if self.path == "/server_error":
+            return 500
+        return 200
+
      def do_GET(self) -> None:
          body = b'<html><body>This is glowfic</body></html>'
-        self.send_response(200)
+        self.send_response(self._response_code())
          self.send_header("Content-type", "text/html")
          self.send_header("Content-Length", str(len(body)))
          self.end_headers()
@@ -25,17 +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)
+        with self.assertRaises(requests.HTTPError):
+            paperdoorknob.fetch(
+                f"http://localhost:{self._port()}/server_error", TIMEOUT)
  
  
  if __name__ == '__main__':