*) test: making pytest option --repeat global as otherwise

     there are conflicts when individual modules add that.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1899198 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/conftest.py b/test/conftest.py
index a5c7c6bffb09fb9e1a11605f50291f3e7d0034c8..3472e969f2c132c458c8ffbfeb6e57929674b115 100644 (file)
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -9,4 +9,16 @@ def pytest_report_header(config, startdir):
     env = HttpdTestEnv()
     return f"[apache httpd: {env.get_httpd_version()}, mpm: {env.mpm_module}, {env.prefix}]"
 
+def pytest_addoption(parser):
+    parser.addoption("--repeat", action="store", type=int, default=1,
+                     help='Number of times to repeat each test')
+    parser.addoption("--all", action="store_true")
+
+
+def pytest_generate_tests(metafunc):
+    if "repeat" in metafunc.fixturenames:
+        count = int(metafunc.config.getoption("repeat"))
+        metafunc.fixturenames.append('tmp_ct')
+        metafunc.parametrize('repeat', range(count))
+
 

diff --git a/test/modules/http2/conftest.py b/test/modules/http2/conftest.py
index 806777439ea79447dc5c572f0d8a254dfd6c3b7c..55d0c3a21e3041f12474f7339ce6997d953e9ef0 100644 (file)
--- a/test/modules/http2/conftest.py
+++ b/test/modules/http2/conftest.py
@@ -14,19 +14,6 @@ def pytest_report_header(config, startdir):
     return f"mod_h2 [apache: {env.get_httpd_version()}, mpm: {env.mpm_module}, {env.prefix}]"
 
 
-def pytest_addoption(parser):
-    parser.addoption("--repeat", action="store", type=int, default=1,
-                     help='Number of times to repeat each test')
-    parser.addoption("--all", action="store_true")
-
-
-def pytest_generate_tests(metafunc):
-    if "repeat" in metafunc.fixturenames:
-        count = int(metafunc.config.getoption("repeat"))
-        metafunc.fixturenames.append('tmp_ct')
-        metafunc.parametrize('repeat', range(count))
-
-
 @pytest.fixture(scope="package")
 def env(pytestconfig) -> H2TestEnv:
     level = logging.INFO

diff --git a/test/modules/tls/conftest.py b/test/modules/tls/conftest.py
index 9580307dfdcc343eb8dbc369220957b72b96cc1a..cde4be607140e5d99f2af5506a2cfac5f52266a3 100644 (file)
--- a/test/modules/tls/conftest.py
+++ b/test/modules/tls/conftest.py
@@ -18,19 +18,6 @@ def pytest_report_header(config, startdir):
     )
 
 
-def pytest_addoption(parser):
-    parser.addoption("--repeat", action="store", type=int, default=1,
-                     help='Number of times to repeat each test')
-    parser.addoption("--all", action="store_true")
-
-
-def pytest_generate_tests(metafunc):
-    if "repeat" in metafunc.fixturenames:
-        count = int(metafunc.config.getoption("repeat"))
-        metafunc.fixturenames.append('tmp_ct')
-        metafunc.parametrize('repeat', range(count))
-
-
 @pytest.fixture(scope="package")
 def env(pytestconfig) -> TlsTestEnv:
     level = logging.INFO