You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2024/07/15 22:42:20 UTC

svn commit: r1919267 - in /httpd/httpd/branches/2.4.x: ./ test/modules/core/conftest.py test/modules/http1/conftest.py test/modules/md/conftest.py test/modules/proxy/conftest.py test/modules/tls/conftest.py

Author: rjung
Date: Mon Jul 15 22:42:20 2024
New Revision: 1919267

URL: http://svn.apache.org/viewvc?rev=1919267&view=rev
Log:
Make sure pytest shuts down the web server after each package.

Backport of r1919265 from trunk.

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/test/modules/core/conftest.py
    httpd/httpd/branches/2.4.x/test/modules/http1/conftest.py
    httpd/httpd/branches/2.4.x/test/modules/md/conftest.py
    httpd/httpd/branches/2.4.x/test/modules/proxy/conftest.py
    httpd/httpd/branches/2.4.x/test/modules/tls/conftest.py

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1919265

Modified: httpd/httpd/branches/2.4.x/test/modules/core/conftest.py
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/test/modules/core/conftest.py?rev=1919267&r1=1919266&r2=1919267&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/test/modules/core/conftest.py (original)
+++ httpd/httpd/branches/2.4.x/test/modules/core/conftest.py Mon Jul 15 22:42:20 2024
@@ -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

Modified: httpd/httpd/branches/2.4.x/test/modules/http1/conftest.py
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/test/modules/http1/conftest.py?rev=1919267&r1=1919266&r2=1919267&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/test/modules/http1/conftest.py (original)
+++ httpd/httpd/branches/2.4.x/test/modules/http1/conftest.py Mon Jul 15 22:42:20 2024
@@ -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

Modified: httpd/httpd/branches/2.4.x/test/modules/md/conftest.py
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/test/modules/md/conftest.py?rev=1919267&r1=1919266&r2=1919267&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/test/modules/md/conftest.py (original)
+++ httpd/httpd/branches/2.4.x/test/modules/md/conftest.py Mon Jul 15 22:42:20 2024
@@ -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

Modified: httpd/httpd/branches/2.4.x/test/modules/proxy/conftest.py
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/test/modules/proxy/conftest.py?rev=1919267&r1=1919266&r2=1919267&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/test/modules/proxy/conftest.py (original)
+++ httpd/httpd/branches/2.4.x/test/modules/proxy/conftest.py Mon Jul 15 22:42:20 2024
@@ -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

Modified: httpd/httpd/branches/2.4.x/test/modules/tls/conftest.py
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/test/modules/tls/conftest.py?rev=1919267&r1=1919266&r2=1919267&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/test/modules/tls/conftest.py (original)
+++ httpd/httpd/branches/2.4.x/test/modules/tls/conftest.py Mon Jul 15 22:42:20 2024
@@ -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