Added conditional to test to increase code coverage, these were missed with current tests.

Author: Dennis Kennetz

tests/test_singularity.py

@@ -33,6 +33,17 @@ def test_singularity_iwdr():
     else:
         assert result_code != 0
 
+def test_singularity_pullfolder_in_env():
+    os.environ["SINGULARITY_PULLFOLDER"] = str(os.getcwd())
+    os.environ["SINGULARITY_CACHEDIR"] = str(os.getcwd())
+    result_code = main(
+        ['--singularity', '--default-container', 'debian',
+         get_data("tests/wf/iwdr-entry.cwl"), "--message", "hello"])
+    for env in ("SINGULARITY_PULLFOLDER", "SINGULARITY_CACHEDIR"):
+        if env in os.environ:
+            assert result_code == 0
+        else:
+            assert result_code != 0
 @needs_singularity
 def test_singularity_incorrect_image_pull():
     result_code, _, stderr = get_main_output(
@@ -58,7 +69,11 @@ def test_singularity_pullfolder(tmp_path):
     pull_folder = tmp_path / "pull_folder"
     pull_folder.mkdir()
     os.environ["SINGULARITY_PULLFOLDER"] = str(pull_folder)
-    result_code, stdout, stderr = get_main_output(
-        ['--singularity', get_data("tests/sing_pullfolder_test.cwl"), "--message", "hello"])
-    file_in_dir = os.listdir(str(pull_folder))
-    assert 'debian.img' in file_in_dir, stderr
+    if "SINGULARITY_PULLFOLDER" in os.environ:
+        result_code, stdout, stderr = get_main_output(
+            ['--singularity', get_data("tests/sing_pullfolder_test.cwl"), "--message", "hello"])
+        file_in_dir = os.listdir(str(pull_folder))
+        assert 'debian.img' in file_in_dir, stderr
+    else:
+        asset result_code != 0
+