Rework server CLI tests to actually count for coverage (#57)

src/anchovy/server.py

@@ -86,7 +86,7 @@ def serve(port: int, directory: str | pathlib.Path, host: str = 'localhost'):
         httpd.serve_forever()
 
 
-def main():
+def main(arguments: list[str] | None = None):
     parser = argparse.ArgumentParser()
     parser.add_argument('-p', '--port',
                         help='port to serve from',
@@ -96,7 +96,7 @@ def main():
                         help='directory to serve',
                         type=pathlib.Path,
                         default='.')
-    args = parser.parse_args()
+    args = parser.parse_args(arguments)
     serve(args.port, args.directory)
 
 

test/test_server.py

@@ -1,14 +1,12 @@
 import contextlib
 import pathlib
 import socket
-import subprocess
-import sys
 import threading
 
 import pytest
 import requests
 
-from anchovy.server import ThreadedHTTPServer
+from anchovy.server import main, ThreadedHTTPServer
 from anchovy.test_harness import run_example
 
 
@@ -36,14 +34,12 @@ def run_server(directory: pathlib.Path, port: int):
 @contextlib.contextmanager
 def run_server_cli(directory: pathlib.Path, port: int):
     args = [
-        sys.executable, '-m', 'anchovy.server',
         '--port', str(port),
         '--directory', str(directory)
     ]
-    with subprocess.Popen(args) as proc:
-        yield
-        proc.terminate()
-
+    thread = threading.Thread(target=main, args=(args,), daemon=True)
+    thread.start()
+    yield
 
 
 @pytest.fixture(scope='module', params=[False, True])