[VVP] Updating vm_type class test to proceed if no cinder

[vvp/validation-scripts.git] / ice_validator / tests / conftest.py

diff --git a/ice_validator/tests/conftest.py b/ice_validator/tests/conftest.py
index 2a1cc55..9a839b5 100644 (file)
--- a/ice_validator/tests/conftest.py
+++ b/ice_validator/tests/conftest.py
@@ -348,7 +348,11 @@ def pytest_sessionfinish(session, exitstatus):
 def pytest_terminal_summary(terminalreporter, exitstatus):
     # Ensures all preload information and warnings appear after
     # test results
-    create_preloads(terminalreporter.config, exitstatus)
+    try:
+        create_preloads(terminalreporter.config, exitstatus)
+    except Exception:
+        print("Error creating preloads, skipping preload generation")
+        traceback.print_exc()
 
 
 # noinspection PyUnusedLocal
@@ -360,13 +364,9 @@ def pytest_collection_modifyitems(session, config, items):
     config.traceability_items = list(items)  # save all items for traceability
     if not config.option.self_test:
         for item in items:
+            passed_categories = set(config.option.test_categories or [])
             all_of_categories = getattr(item.function, "all_categories", set())
             any_of_categories = getattr(item.function, "any_categories", set())
-            if any_of_categories and all_of_categories:
-                raise RuntimeError(
-                    "categories can not use 'any_of' with other categories"
-                )
-            passed_categories = set(config.option.test_categories or [])
             if all_of_categories and not all_of_categories.issubset(passed_categories):
                 item.add_marker(
                     pytest.mark.skip(
@@ -375,7 +375,7 @@ def pytest_collection_modifyitems(session, config, items):
                         )
                     )
                 )
-            elif any_of_categories and not passed_categories.intersection(
+            if any_of_categories and not passed_categories.intersection(
                 any_of_categories
             ):
                 item.add_marker(