[6.12.z] Pytest FixtureCollection external plugin (SatelliteQE#13205)

Pytest FixtureCollection external plugin (SatelliteQE#13176) (cherry picked from commit a9ffccd) Co-authored-by: Jitendra Yejare <[email protected]>
omkarkhatavkar · Nov 30, 2023 · 50bcd1f · 50bcd1f
1 parent 3a668e5
commit 50bcd1f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 42 deletions.
diff --git a/conftest.py b/conftest.py
@@ -17,7 +17,6 @@
     'pytest_plugins.settings_skip',
     'pytest_plugins.rerun_rp.rerun_rp',
     'pytest_plugins.fspath_plugins',
-    'pytest_plugins.fixture_collection',
     'pytest_plugins.factory_collection',
     'pytest_plugins.requirements.update_requirements',
     'pytest_plugins.sanity_plugin',

diff --git a/pytest_plugins/fixture_collection.py b/pytest_plugins/fixture_collection.py
diff --git a/requirements.txt b/requirements.txt
@@ -17,6 +17,7 @@ pytest-services==2.2.1
 pytest-mock==3.12.0
 pytest-reportportal==5.3.0
 pytest-xdist==3.5.0
+pytest-fixturecollection==0.1.1
 pytest-ibutsu==2.2.4
 PyYAML==6.0.1
 requests==2.31.0

diff --git a/tests/foreman/conftest.py b/tests/foreman/conftest.py
@@ -36,7 +36,8 @@ def pytest_collection_modifyitems(session, items, config):
         if deselect:
             deselected_items.append(item)
             reason = deselect.kwargs.get('reason', deselect.args)
-            collection_logger.debug(f'Deselected test "{item.name}" reason: {reason}')
+            collection_logger.debug(
+                f'Deselected test "{item.name}" reason: {reason}')
             # Do nothing more with deselected tests
             continue
 
@@ -57,7 +58,12 @@ def ui_session_record_property(request, record_property):
         request: The pytest request object.
         record_property: The value to set for the record_property attribute.
     """
-    test_directories = ['tests/foreman/destructive', 'tests/foreman/ui']
+    test_directories = [
+        'tests/foreman/destructive',
+        'tests/foreman/ui',
+        'tests/foreman/sanity',
+        'tests/foreman/virtwho',
+    ]
     test_file_path = request.node.fspath.strpath
     if any(directory in test_file_path for directory in test_directories):
         for fixture in request.node.fixturenames: