Fix workspace info tests

GoogleCloudPlatform · Mar 7, 2024 · 1fc88c4 · 1fc88c4
1 parent 28f6ce0
commit 1fc88c4
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 10 deletions.
diff --git a/lib/ramble/ramble/cmd/workspace.py b/lib/ramble/ramble/cmd/workspace.py
@@ -589,9 +589,10 @@ def workspace_info(args):
 
                 for exp_name, _, _ in print_experiment_set.filtered_experiments(filters):
                     app_inst = experiment_set.get_experiment(exp_name)
-                    software_environments.render_environment(
-                        app_inst.expander.expand_var('{env_name}'), app_inst.expander
-                    )
+                    if app_inst.uses_spack:
+                        software_environments.render_environment(
+                            app_inst.expander.expand_var('{env_name}'), app_inst.expander
+                        )
 
                     if print_header:
                         color.cprint(rucolor.nested_1('  Application: ') +

diff --git a/lib/ramble/ramble/test/cmd/workspace.py b/lib/ramble/ramble/test/cmd/workspace.py
@@ -103,8 +103,18 @@ def check_info_basic(output):
     assert 'Workload' in output
     assert 'Experiment' in output
     assert 'Software Stack' in output
-    assert 'Packages' in output
-    assert 'Environments' in output
+
+
+def check_info_zlib(output):
+    assert 'zlib' in output
+    assert 'ensure_installed' in output
+
+    assert 'Application' in output
+    assert 'Workload' in output
+    assert 'Experiment' in output
+    assert 'Software Stack' in output
+    assert 'Template Package' in output
+    assert 'Template Environment' in output
 
 
 def check_results(ws):
@@ -178,11 +188,22 @@ def test_workspace_info():
             test_experiment:
               variables:
                 n_nodes: '2'
-
+    zlib:
+      workloads:
+        ensure_installed:
+          experiments:
+            test_experiment:
+              variables:
+                n_nodes: '2'
   spack:
     concretized: true
-    packages: {}
-    environments: {}
+    packages:
+      zlib:
+        spack_spec: 'zlib'
+    environments:
+      zlib:
+        packages:
+        - zlib
 """
 
     workspace_name = 'test_info'
@@ -221,10 +242,22 @@ def test_workspace_info_prints_all_levels():
             test_experiment:
               variables:
                 n_nodes: '2'
+    zlib:
+      workloads:
+        ensure_installed:
+          experiments:
+            test_experiment:
+              variables:
+                n_nodes: '2'
   spack:
     concretized: true
-    packages: {}
-    environments: {}
+    packages:
+      zlib:
+        spack_spec: 'zlib'
+    environments:
+      zlib:
+        packages:
+        - zlib
 """
 
     config_file = """