Introduce feature directories in tests

ekohl · ekohl · commit e4cf4ed9fb0a · 2026-07-09T20:25:58.000+02:00
This sets up a directory structure where an entire directory gets a
feature mark. This makes it easy to skip entire feature tests.
diff --git a/docs/developer/testing.md b/docs/developer/testing.md
@@ -259,10 +259,12 @@ def test_dynflow_service_instances(server, instance):
 
 ## Where to add new tests
 
+The directory `tests/feature` is special. Any subdirectory automatically applies the feature marker. `tests/feature/foreman/api_test.py` is equivalent to `tests/foreman_api_test.py` with `pytestmark = pytest.mark.feature("foreman")`.
+
 | What you're testing | File |
 | --- | --- |
-| A new service (container or systemd unit) | `tests/<service>_test.py` |
-| Foreman API behavior | `tests/foreman_api_test.py` (or a new file for larger areas) |
+| A new service (container or systemd unit) | `tests/feature/<feature>/<service>_test.py` |
+| Foreman API behavior | `tests/feature/foreman/api_test.py` (or a new file for larger areas) |
 | Client registration or content workflows | `tests/client_test.py` |
 | CLI flags, playbooks, or feature management | `tests/features_test.py` or `tests/playbooks_test.py` |
 | A standalone script (no deployment needed) | `tests/unit/<name>_test.py` |
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -282,6 +282,17 @@ def pytest_collection_modifyitems(config, items):
         config.hook.pytest_deselected(items=deselected)
         items[:] = selected
 
+    feature_dir = config.rootdir / 'tests' / 'feature'
+    for item in items:
+        try:
+            rel_path = item.path.relative_to(feature_dir)
+        except ValueError:
+            # Not in the features directory
+            pass
+        else:
+            feature = rel_path.parts[0]
+            item.add_marker(pytest.mark.feature(feature))
+
 
 def pytest_runtest_setup(item):
     feature_markers = set(mark.args[0] for mark in item.iter_markers(name="feature"))
diff --git a/tests/feature/__init__.py b/tests/feature/__init__.py
diff --git a/tests/feature/iop/__init__.py b/tests/feature/iop/__init__.py
diff --git a/tests/feature/iop/conftest.py b/tests/feature/iop/conftest.py
diff --git a/tests/feature/iop/images_test.py b/tests/feature/iop/images_test.py
@@ -1,7 +1,5 @@
 import pytest
 
-pytestmark = pytest.mark.feature("iop")
-
 IOP_IMAGES = [
     "iop-kafka",
     "iop-ingress",
diff --git a/tests/feature/iop/test_advisor.py b/tests/feature/iop/test_advisor.py
@@ -1,8 +1,3 @@
-import pytest
-
-pytestmark = pytest.mark.feature("iop")
-
-
 def test_advisor_backend_api_service(server):
     service = server.service("iop-service-advisor-backend-api")
     assert service.is_running
diff --git a/tests/feature/iop/test_advisor_frontend.py b/tests/feature/iop/test_advisor_frontend.py
@@ -1,8 +1,3 @@
-import pytest
-
-pytestmark = pytest.mark.feature("iop")
-
-
 def test_advisor_frontend_assets_directory(server):
     assets_dir = server.file("/var/www/iop/assets/apps/advisor")
     assert assets_dir.exists
diff --git a/tests/feature/iop/test_cvemap_downloader.py b/tests/feature/iop/test_cvemap_downloader.py
@@ -1,8 +1,3 @@
-import pytest
-
-pytestmark = pytest.mark.feature("iop")
-
-
 def test_cvemap_download_script(server):
     script = server.file("/usr/local/bin/iop-cvemap-download.sh")
     assert script.exists
diff --git a/tests/feature/iop/test_engine.py b/tests/feature/iop/test_engine.py
@@ -1,8 +1,3 @@
-import pytest
-
-pytestmark = pytest.mark.feature("iop")
-
-
 def test_engine_service(server):
     service = server.service("iop-core-engine")
     assert service.is_running
diff --git a/tests/feature/iop/test_gateway.py b/tests/feature/iop/test_gateway.py
@@ -1,8 +1,3 @@
-import pytest
-
-pytestmark = pytest.mark.feature("iop")
-
-
 def test_gateway_service(server):
     service = server.service("iop-core-gateway")
     assert service.is_running
diff --git a/tests/feature/iop/test_ingress.py b/tests/feature/iop/test_ingress.py
@@ -1,8 +1,3 @@
-import pytest
-
-pytestmark = pytest.mark.feature("iop")
-
-
 def test_ingress_service(server):
     service = server.service("iop-core-ingress")
     assert service.is_running
diff --git a/tests/feature/iop/test_integration.py b/tests/feature/iop/test_integration.py
@@ -1,8 +1,3 @@
-import pytest
-
-pytestmark = pytest.mark.feature("iop")
-
-
 def test_iop_core_kafka_service(server):
     service = server.service("iop-core-kafka")
     assert service.is_running
diff --git a/tests/feature/iop/test_inventory.py b/tests/feature/iop/test_inventory.py
@@ -1,8 +1,3 @@
-import pytest
-
-pytestmark = pytest.mark.feature("iop")
-
-
 def test_inventory_migrate_service(server):
     service = server.service("iop-core-host-inventory-migrate")
     assert service.is_enabled
diff --git a/tests/feature/iop/test_inventory_frontend.py b/tests/feature/iop/test_inventory_frontend.py
@@ -1,8 +1,3 @@
-import pytest
-
-pytestmark = pytest.mark.feature("iop")
-
-
 def test_inventory_frontend_assets_directory(server):
     assets_dir = server.file("/var/www/iop/assets/apps/inventory")
     assert assets_dir.exists
diff --git a/tests/feature/iop/test_kafka.py b/tests/feature/iop/test_kafka.py
@@ -1,8 +1,3 @@
-import pytest
-
-pytestmark = pytest.mark.feature("iop")
-
-
 def test_kafka_service(server):
     service = server.service("iop-core-kafka")
     assert service.is_running
diff --git a/tests/feature/iop/test_puptoo.py b/tests/feature/iop/test_puptoo.py
@@ -1,8 +1,3 @@
-import pytest
-
-pytestmark = pytest.mark.feature("iop")
-
-
 def test_puptoo_service(server):
     service = server.service("iop-core-puptoo")
     assert service.is_running
diff --git a/tests/feature/iop/test_remediation.py b/tests/feature/iop/test_remediation.py
@@ -1,8 +1,3 @@
-import pytest
-
-pytestmark = pytest.mark.feature("iop")
-
-
 def test_remediation_api_service(server):
     service = server.service("iop-service-remediations-api")
     assert service.is_running
diff --git a/tests/feature/iop/test_vmaas.py b/tests/feature/iop/test_vmaas.py
@@ -1,8 +1,3 @@
-import pytest
-
-pytestmark = pytest.mark.feature("iop")
-
-
 def test_vmaas_reposcan_service(server):
     service = server.service("iop-service-vmaas-reposcan")
     assert service.is_running
diff --git a/tests/feature/iop/test_vulnerability.py b/tests/feature/iop/test_vulnerability.py
@@ -1,8 +1,3 @@
-import pytest
-
-pytestmark = pytest.mark.feature("iop")
-
-
 def test_vulnerability_manager_service(server):
     service = server.service("iop-service-vuln-manager")
     assert service.is_running
diff --git a/tests/feature/iop/test_vulnerability_frontend.py b/tests/feature/iop/test_vulnerability_frontend.py
@@ -1,8 +1,3 @@
-import pytest
-
-pytestmark = pytest.mark.feature("iop")
-
-
 def test_vulnerability_frontend_assets_directory(server):
     assets_dir = server.file("/var/www/iop/assets/apps/vulnerability")
     assert assets_dir.exists
diff --git a/tests/feature/iop/test_yuptoo.py b/tests/feature/iop/test_yuptoo.py
@@ -1,8 +1,3 @@
-import pytest
-
-pytestmark = pytest.mark.feature("iop")
-
-
 def test_yuptoo_service(server):
     service = server.service("iop-core-yuptoo")
     assert service.is_running
