make CI green

Signed-off-by: Abhijeet Kasurde <[email protected]>

src/ansible_builder/_target_scripts/introspect.py

@@ -344,8 +344,9 @@ def sanitize_requirements(collection_py_reqs):
                 consolidated.append(req)
                 seen_pkgs.add(req.name)
         except Exception as e:
-            logger.error('Failed to parse requirements from %s, error: %s', collection, e)
-            sys.exit(1)
+            msg = f'Failed to parse requirements from {collection}, error: {e}'
+            logger.error(msg)
+            sys.exit(msg)
 
     # removal of unwanted packages
     sanitized = []

test/conftest.py

@@ -46,6 +46,8 @@ def pytest_sessionfinish(session, exitstatus):
     # If we are the main worker thread, we've been called last, so do the cleanup.
     if worker_id is None:
         for runtime in CONTAINER_RUNTIMES:
+            if runtime not in FOUND_RUNTIMES:
+                continue
             data_file = pathlib.Path(base_tmpfile + runtime)
             if data_file.exists():
                 for image_name in data_file.read_text().split("\n"):

test/unit/test_introspect.py

@@ -72,4 +72,4 @@ def test_parse_args_default_action():
 def test_corrupt_python_requirements():
     with pytest.raises(SystemExit) as excinfo:
         sanitize_requirements({'test.metadata': ['invalid_package=1']})
-    assert excinfo.value.code == 1
+    assert excinfo.value.code.startswith('Failed to parse requirements from')

test/unit/test_requirements.py

@@ -1,3 +1,5 @@
+import pytest
+
 from ansible_builder._target_scripts.introspect import sanitize_requirements
 
 
@@ -28,12 +30,14 @@ def test_remove_unwanted_requirements():
 
 
 def test_skip_bad_formats():
-    """A single incorrectly formatted requirement should warn, but not block other reqs"""
-    assert sanitize_requirements({'foo.bar': [
-        'foo',
-        'bar'
-    ], 'foo.bad': ['zizzer zazzer zuzz']  # not okay
-    }) == ['foo  # from collection foo.bar', 'bar  # from collection foo.bar']
+    """A single incorrectly formatted requirement should raise error"""
+
+    with pytest.raises(SystemExit) as exc_info:
+        sanitize_requirements({
+            'foo.bar': ['foo', 'bar'],
+            'foo.bad': ['zizzer zazzer zuzz']  # not okay
+        })
+    assert exc_info.value.code.startswith('Failed to parse requirements')
 
 
 def test_sanitize_requirements_do_not_exclude():