adding more directories to save for forensics.

irods-contrib · Feb 2, 2024 · 2c3feec · 2c3feec
1 parent 20f6583
commit 2c3feec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/staging/staging.py b/src/staging/staging.py
@@ -203,11 +203,11 @@ def create_test_files(self, run_dir: str, run_data: json, workflow_type: Workflo
                                 fp.write(f'echo "Running {test}"; {base_cmd_line}{topology_test_type} --run_s {test};\n')
 
                             # declare the testing complete
-                            fp.write(f'echo "Copying test results..."; cp ./test-reports/*.xml {run_dir};\n')
+                            fp.write(f'echo "Copying /var/lib/irods/test-report/ results..."; cp ./test-reports/*.xml {run_dir};\n')
 
-                            # save these directories for more forensics
-                            fp.write(f'echo "Copying test results..."; cp -r /var/log/irods/ /data/{run_dir}/var/log/irods;\n')
-                            fp.write(f'echo "Copying test results..."; cp -r /var/lib/irods/log/ /data/{run_dir}/var/lib/irods/log;\n')
+                            # save these directories for extended forensics
+                            fp.write(f'echo "Copying /var/lib/irods/log dir..."; mv ./log {run_dir};\n')
+                            fp.write(f'echo "Copying /var/log/irods/ dir..."; mv /var/log/irods/ {run_dir};\n')
 
                         # make sure the file has the correct permissions
                         if sys.platform != 'win32':

diff --git a/src/tests/test_staging.py b/src/tests/test_staging.py
@@ -100,7 +100,7 @@ def test_run():
     assert ret_val == ReturnCodes.EXIT_CODE_SUCCESS and not os.path.isdir(run_dir)
 
 
-@pytest.mark.skip(reason="Local test only")
+#@pytest.mark.skip(reason="Local test only")
 def test_file_creation():
     """
     tests the creation of a file that contains the requested tests