Merge pull request #1326 from linsword13/spack-runner-fixture

Add a spack-runner pytest fixture

Author: douglasjacobsen

conftest.py

@@ -25,6 +25,8 @@
 import ramble.stage
 import ramble.workspace
 from ramble.fetch_strategy import FetchError, FetchStrategyComposite, URLFetchStrategy
+from ramble.pkg_man.builtin.spack_lightweight import SpackRunner
+from ramble.util.command_runner import RunnerError
 from ramble.util.file_util import is_dry_run_path
 
 import spack.platforms
@@ -172,6 +174,15 @@ def mock_wms_repo_path():
     yield ramble.repository.Repo(ramble.paths.mock_builtin_path, obj_type)
 
 
+@pytest.fixture
+def ensure_spack_runner():
+    """Fixture to check for spack runner and skip if not found."""
+    try:
+        SpackRunner()
+    except RunnerError as e:
+        pytest.skip(f"Spack runner not found, skipping test: {e}")
+
+
 def _get_obj_repo_path(obj_type, extra_repo_path):
     repos = []
     # extra_repo_path takes precedence

lib/ramble/ramble/test/end_to_end/package_manager_requirements.py

@@ -12,16 +12,17 @@
 
 import ramble.workspace
 from ramble.main import RambleCommand
-from ramble.pkg_man.builtin.spack_lightweight import SpackRunner, ValidationFailedError
-from ramble.util.command_runner import RunnerError
+from ramble.pkg_man.builtin.spack_lightweight import ValidationFailedError
 
 pytestmark = pytest.mark.usefixtures("mutable_config", "mutable_mock_workspace_path")
 
 workspace = RambleCommand("workspace")
 
 
 @pytest.mark.long
-def test_package_manager_requirements_zlib(mock_applications, mock_modifiers, workspace_name):
+def test_package_manager_requirements_zlib(
+    mock_applications, mock_modifiers, workspace_name, ensure_spack_runner
+):
     test_config = """
 ramble:
   variants:
@@ -47,11 +48,6 @@ def test_package_manager_requirements_zlib(mock_applications, mock_modifiers, wo
         packages: []
 """
 
-    try:
-        SpackRunner()
-    except RunnerError as e:
-        pytest.skip(e)
-
     with ramble.workspace.create(workspace_name) as ws:
         ws.write()
 
@@ -73,7 +69,9 @@ def test_package_manager_requirements_zlib(mock_applications, mock_modifiers, wo
             assert "debug: true" in data
 
 
-def test_package_manager_requirements_error(mock_applications, mock_modifiers, workspace_name):
+def test_package_manager_requirements_error(
+    mock_applications, mock_modifiers, workspace_name, ensure_spack_runner
+):
     test_config = """
 ramble:
   variants:
@@ -99,11 +97,6 @@ def test_package_manager_requirements_error(mock_applications, mock_modifiers, w
         packages: []
 """
 
-    try:
-        SpackRunner()
-    except RunnerError as e:
-        pytest.skip(e)
-
     with ramble.workspace.create(workspace_name) as ws:
         ws.write()