make test more flexible

Author: mr-c

tests/test_singularity.py

@@ -48,16 +48,14 @@ def test_singularity_local():
     assert 'debian.img' in file_in_dir
 
 @needs_singularity
-def test_singularity_pullfolder():
-    filepath = str(os.getcwd())
-    tmp = '/tmp/'
-    pull_folder = filepath+tmp
-    if not os.path.exists(pull_folder):
-        os.makedirs(pull_folder)
-    os.environ["SINGULARITY_PULLFOLDER"] = pull_folder
-    result_code, _, stderr = get_main_output(
+def test_singularity_pullfolder(tmp_path):
+    workdir = tmp_path / "working_dir"
+    workdir.mkdir()
+    os.chdir(str(workdir))
+    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(pull_folder)
-    assert 'debian.img' in file_in_dir
-
-
+    file_in_dir = os.listdir(str(pull_folder))
+    assert 'debian.img' in file_in_dir, stderr