From 471e666914f2c0ca687914986ebcbf820877ffa3 Mon Sep 17 00:00:00 2001 From: Anthony Bartoletti Date: Fri, 10 Jan 2025 18:23:57 -0600 Subject: [PATCH 1/2] fixed typos in tests3 README file. --- tests3/README_TEST_BLOCKING | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests3/README_TEST_BLOCKING b/tests3/README_TEST_BLOCKING index 0a0fb6fe..95b81d0e 100644 --- a/tests3/README_TEST_BLOCKING +++ b/tests3/README_TEST_BLOCKING @@ -17,7 +17,7 @@ the local copy can be deleted before the next tar-file is created. I. File System Setup ==================== -s one may want, or need to re-conduct testing under varied conditions, the +As one may want, or need to re-conduct testing under varied conditions, the test script: test_zstash_blocking.sh @@ -60,7 +60,7 @@ Note: It never hurts to run the supplied script: before a test run. This will delete any archives in the src_data/zstash cache and the receiving dst_data directories, and delete the src_data/zstash directory itself if it exists. This ensures a clean restart for testing. -The rad data files placed into src_data are not affected. +The raw data files placed into src_data are not affected. II. Running the Test Script =========================== @@ -84,7 +84,7 @@ If "NON_BLOCKING" is selected, the zstash flag "--non-blocking" is supplied to the zstash command line, and tar files continue to be created in parallel to running Globus transfers. -It is suggested that you reun the test script with +It is suggested that you run the test script with test_zstash_blocking.sh (BLOCKING|NON_BLOCKING) > your_logfile 2>&1 @@ -93,8 +93,8 @@ so that your command prompt returns and you can monitor progress with snapshot.sh which will provide a view of both the tarfile cache and the destination -directory for delivred tar files. It is also suugested that you name your -logfile to reflect the date, and whether BLOCKING or not. +directory for delivred tar files. It is also suggested that you name your +logfile to reflect the date, and whether BLOCKING or not was specified. FINAL NOTE: In the zstash code, the tar file "MINSIZE" parameter is taken From c0929ad75ea7d84c2399a32b5f14af9fdc4d0e1c Mon Sep 17 00:00:00 2001 From: Ryan Forsyth Date: Mon, 13 Jan 2025 16:41:29 -0800 Subject: [PATCH 2/2] Fix pre-commit errors --- tests3/README_TEST_BLOCKING | 4 ++-- tests3/snapshot.sh | 2 -- tests3/test_zstash_blocking.sh | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/tests3/README_TEST_BLOCKING b/tests3/README_TEST_BLOCKING index 95b81d0e..e367335b 100644 --- a/tests3/README_TEST_BLOCKING +++ b/tests3/README_TEST_BLOCKING @@ -39,7 +39,7 @@ working directory: [CWD]/dst_data/ - destination for Globus transfer of archives. - + [CWD]/tmp_cache/ - [Optional] alternative location for tar-file generation. @@ -86,7 +86,7 @@ to running Globus transfers. It is suggested that you run the test script with - test_zstash_blocking.sh (BLOCKING|NON_BLOCKING) > your_logfile 2>&1 + test_zstash_blocking.sh (BLOCKING|NON_BLOCKING) > your_logfile 2>&1 so that your command prompt returns and you can monitor progress with diff --git a/tests3/snapshot.sh b/tests3/snapshot.sh index 869812dc..7bbaef79 100755 --- a/tests3/snapshot.sh +++ b/tests3/snapshot.sh @@ -10,5 +10,3 @@ ls -l src_data/zstash echo "" echo "tmp_cache:" ls -l tmp_cache - - diff --git a/tests3/test_zstash_blocking.sh b/tests3/test_zstash_blocking.sh index 2d58622d..bae334a8 100755 --- a/tests3/test_zstash_blocking.sh +++ b/tests3/test_zstash_blocking.sh @@ -70,4 +70,3 @@ fi echo "Testing Completed" exit 0 -