Make sure pytest shuts down the web server after each package.

Backport of r1919265 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1919267 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/modules/core/conftest.py b/test/modules/core/conftest.py
index 22906efbb040551dbbe552f7023849ce0f638e36..a14bdfb6752d28d529b14c1e9ae6ab0ec76f496f 100644 (file)
--- a/test/modules/core/conftest.py
+++ b/test/modules/core/conftest.py
@@ -28,3 +28,8 @@ def env(pytestconfig) -> CoreTestEnv:
     env.apache_access_log_clear()
     env.httpd_error_log.clear_log()
     return env
+
+@pytest.fixture(autouse=True, scope="package")
+def _stop_package_scope(env):
+    yield
+    assert env.apache_stop() == 0

diff --git a/test/modules/http1/conftest.py b/test/modules/http1/conftest.py
index 33a16a117043faff81aa4e71ec53be544672cfa2..45b26c1796f226d25a56f7bf7521f170d4970402 100644 (file)
--- a/test/modules/http1/conftest.py
+++ b/test/modules/http1/conftest.py
@@ -34,3 +34,8 @@ def env(pytestconfig) -> H1TestEnv:
     env.apache_access_log_clear()
     env.httpd_error_log.clear_log()
     return env
+
+@pytest.fixture(autouse=True, scope="package")
+def _stop_package_scope(env):
+    yield
+    assert env.apache_stop() == 0

diff --git a/test/modules/md/conftest.py b/test/modules/md/conftest.py
index 0f9e4a9f490df87285feea6c0d3ec25313fac2bc..a7b064b6a981b12ccb3f676e6a33a58703b28dfa 100755 (executable)
--- a/test/modules/md/conftest.py
+++ b/test/modules/md/conftest.py
@@ -59,3 +59,7 @@ def acme(env):
     if acme_server is not None:
         acme_server.stop()
 
+@pytest.fixture(autouse=True, scope="package")
+def _stop_package_scope(env):
+    yield
+    assert env.apache_stop() == 0

diff --git a/test/modules/proxy/conftest.py b/test/modules/proxy/conftest.py
index 7e6f4e7b09d2f34f026d8ef5093a05e930c50db8..c92e363e2a5a8ca96aac0625b891211618c880e2 100644 (file)
--- a/test/modules/proxy/conftest.py
+++ b/test/modules/proxy/conftest.py
@@ -29,3 +29,8 @@ def env(pytestconfig) -> ProxyTestEnv:
     env.apache_access_log_clear()
     env.httpd_error_log.clear_log()
     return env
+
+@pytest.fixture(autouse=True, scope="package")
+def _stop_package_scope(env):
+    yield
+    assert env.apache_stop() == 0

diff --git a/test/modules/tls/conftest.py b/test/modules/tls/conftest.py
index c7cb85877d533c700bb9607cfb5e0efa1e043b91..6f6f983cfd42521fe37b8f15a5bfc84cd61f089b 100644 (file)
--- a/test/modules/tls/conftest.py
+++ b/test/modules/tls/conftest.py
@@ -31,3 +31,8 @@ def env(pytestconfig) -> TlsTestEnv:
     env.apache_access_log_clear()
     env.httpd_error_log.clear_log()
     return env
+
+@pytest.fixture(autouse=True, scope="package")
+def _stop_package_scope(env):
+    yield
+    assert env.apache_stop() == 0