From: Scott Worley Date: Tue, 19 Dec 2023 08:36:35 +0000 (-0800) Subject: Extract fake webserver X-Git-Url: http://git.scottworley.com/paperdoorknob/commitdiff_plain/41b11505f297962d099b75a0372a4068e26773a5 Extract fake webserver --- diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py index 9ea877d..c896810 100644 --- a/paperdoorknob_test.py +++ b/paperdoorknob_test.py @@ -8,105 +8,47 @@ import unittest import io import subprocess -import threading -from http.server import BaseHTTPRequestHandler, HTTPServer import requests import requests_cache import paperdoorknob +from testing.fakeserver import FakeGlowficServer TIMEOUT = 8 -class FakeGlowficHTTPRequestHandler(BaseHTTPRequestHandler): - - def _notify_test(self) -> None: - raise NotImplementedError() - - 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''' - -

We don't want edit boxes

- This is glowfic - -

We don't want edit boxes

- You sure? - -

- Pretty sure. -

- -''' - self.send_response(self._response_code()) - self.send_header("Content-type", "text/html") - 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: - 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() + self._server = self.enterContext(FakeGlowficServer()) + self._port = self._server.port() def testFetch(self) -> None: 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) + paperdoorknob.fetch(f"http://localhost:{self._port}", s, TIMEOUT) + self.assertEqual(self._server.request_count(), 1) + paperdoorknob.fetch(f"http://localhost:{self._port}", s, TIMEOUT) + self.assertEqual(self._server.request_count(), 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) + paperdoorknob.fetch(f"http://localhost:{self._port}", s, TIMEOUT) + self.assertEqual(self._server.request_count(), 1) + paperdoorknob.fetch(f"http://localhost:{self._port}", s, TIMEOUT) + self.assertEqual(self._server.request_count(), 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) + paperdoorknob.fetch(f"http://localhost:{self._port}", s, TIMEOUT) + self.assertEqual(self._server.request_count(), 1) 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._server.request_count(), 1) def testReplies(self) -> None: with requests.session() as s: replies = paperdoorknob.replies( paperdoorknob.clean( paperdoorknob.fetch( - f"http://localhost:{self._port()}", + f"http://localhost:{self._port}", s, TIMEOUT))) self.assertEqual([r.text.strip() for r in replies], @@ -116,16 +58,16 @@ class TestFetch(unittest.TestCase): with requests.session() as s: with self.assertRaises(requests.HTTPError): paperdoorknob.fetch( - f"http://localhost:{self._port()}/not_found", s, TIMEOUT) + 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) + f"http://localhost:{self._port}/server_error", s, TIMEOUT) def testProcess(self) -> None: with requests.session() as s: buf = io.BytesIO() paperdoorknob.process( - f"http://localhost:{self._port()}", + f"http://localhost:{self._port}", s, TIMEOUT, buf, @@ -142,11 +84,7 @@ Pretty sure. with requests.session() as s: with open("test.tex", 'wb') as out: paperdoorknob.process( - f"http://localhost:{self._port()}", - s, - TIMEOUT, - out, - 'pandoc') + f"http://localhost:{self._port}", s, TIMEOUT, out, 'pandoc') subprocess.run(['pdflatex', 'test.tex'], stdin=subprocess.DEVNULL, check=True) diff --git a/testing/__init__.py b/testing/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/testing/fakeserver.py b/testing/fakeserver.py new file mode 100644 index 0000000..2ed8149 --- /dev/null +++ b/testing/fakeserver.py @@ -0,0 +1,72 @@ +from typing import Any, Self +import threading +from http.server import BaseHTTPRequestHandler, HTTPServer + + +class FakeGlowficHTTPRequestHandler(BaseHTTPRequestHandler): + + def _notify_server(self) -> None: + raise NotImplementedError() + + 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''' + +

We don't want edit boxes

+ This is glowfic + +

We don't want edit boxes

+ You sure? + +

+ Pretty sure. +

+ +''' + self.send_response(self._response_code()) + self.send_header("Content-type", "text/html") + self.send_header("Content-Length", str(len(body))) + self.end_headers() + self.wfile.write(body) + self._notify_server() + + +class FakeGlowficServer(): + def __init__(self) -> None: + self._request_counter = 0 + handler = type("Handler", (FakeGlowficHTTPRequestHandler,), { + '_notify_server': lambda _: self._count_request()}) + self._web_server = HTTPServer(('', 0), handler) + self._thread = threading.Thread(target=self._web_server.serve_forever) + + def __enter__(self) -> Self: + self._thread.start() + return self + + def __exit__(self, *_: Any) -> None: + self._web_server.shutdown() + self._thread.join() + self._web_server.server_close() + + def _count_request(self) -> None: + self._request_counter += 1 + + def port(self) -> int: + p = self._web_server.socket.getsockname()[1] + assert isinstance(p, int) + return p + + def request_count(self) -> int: + return self._request_counter