X-Git-Url: http://git.scottworley.com/paperdoorknob/blobdiff_plain/681380e2377aba038aaa22e1992dea54d6697a70..ba3b7c52144a19a83892638415d2bfdb667888f5:/paperdoorknob_test.py?ds=inline

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index cf945d6..cb70ac5 100644
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -9,6 +9,7 @@ import unittest
 import threading
 from http.server import BaseHTTPRequestHandler, HTTPServer
 import requests
+import requests_cache
 import paperdoorknob
 
 TIMEOUT = 8
@@ -16,6 +17,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,6 +34,7 @@ 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):
@@ -38,25 +43,52 @@ class TestFetch(unittest.TestCase):
         assert isinstance(port, int)
         return port
 
+    def _count_request(self) -> None:
+        self._request_counter += 1
+
     def setUp(self) -> None:
-        self._web_server = HTTPServer(('', 0), FakeGlowficHTTPRequestHandler)
+        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()
 
     def tearDown(self) -> None:
         self._web_server.shutdown()
         self._thread.join()
+        self._web_server.server_close()
 
     def testFetch(self) -> None:
-        paperdoorknob.fetch(f"http://localhost:{self._port()}", TIMEOUT)
+        with requests.session() as s:
+            paperdoorknob.fetch(f"http://localhost:{self._port()}", s, TIMEOUT)
+            self.assertEqual(self._request_counter, 1)
+            paperdoorknob.fetch(f"http://localhost:{self._port()}", s, TIMEOUT)
+            self.assertEqual(self._request_counter, 2)
+
+    def testFetchCaching(self) -> None:
+        with requests_cache.CachedSession() as s:
+            paperdoorknob.fetch(f"http://localhost:{self._port()}", s, TIMEOUT)
+            self.assertEqual(self._request_counter, 1)
+            paperdoorknob.fetch(f"http://localhost:{self._port()}", s, TIMEOUT)
+            self.assertEqual(self._request_counter, 1)
+
+    def testFetchPersistentCaching(self) -> None:
+        with requests_cache.CachedSession() as s:
+            paperdoorknob.fetch(f"http://localhost:{self._port()}", s, TIMEOUT)
+            self.assertEqual(self._request_counter, 1)
+        with requests_cache.CachedSession() as s:
+            paperdoorknob.fetch(f"http://localhost:{self._port()}", s, TIMEOUT)
+            self.assertEqual(self._request_counter, 1)
 
     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)
+        with requests.session() as s:
+            with self.assertRaises(requests.HTTPError):
+                paperdoorknob.fetch(
+                    f"http://localhost:{self._port()}/not_found", s, TIMEOUT)
+            with self.assertRaises(requests.HTTPError):
+                paperdoorknob.fetch(
+                    f"http://localhost:{self._port()}/server_error", s, TIMEOUT)
 
 
 if __name__ == '__main__':