Merge branch 'master' into pypy

CODAIT · Jan 6, 2021 · 2a5404f · 2a5404f
2 parents 2a2fdb2 + 01dda12
commit 2a5404f
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -90,6 +90,7 @@ def local_http_server() -> HTTPServer:
         # Start a new thread, because httpd.serve_forever is blocking
         threading.Thread(target=httpd.serve_forever, name='Local Http Server', daemon=True).start()
         yield httpd
+        httpd.shutdown()
 
 
 @pytest.fixture(scope='session')
@@ -119,6 +120,7 @@ def local_https_server() -> HTTPServer:
         # Start a new thread, because httpd.serve_forever is blocking
         threading.Thread(target=httpd.serve_forever, name='Local Https Server', daemon=True).start()
         yield httpd
+        httpd.shutdown()
 
 
 @pytest.fixture(scope='session')