Consolidate test script

Author: forsyth2

tests/integration/bash_tests/run_from_chrysalis/blocking_test_scripts/README.md

@@ -73,14 +73,14 @@ to running Globus transfers.
 It is suggested that you run the test script with
 
 ```
-test_zstash_blocking.sh (BLOCKING|NON_BLOCKING) 2>&1 | tee your_logfile
+./test_zstash_blocking.sh (BLOCKING|NON_BLOCKING) 2>&1 | tee your_logfile
 ```
 
 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 delivered tar files. It is also suggested that you name your
 logfile to reflect the date, and whether BLOCKING or not was specified. Example:
 ```bash
-test_zstash_blocking.sh BLOCKING 2>&1 | tee test_zstash_blocking_20251020.log
+./test_zstash_blocking.sh BLOCKING 2>&1 | tee test_zstash_blocking_20251020.log
 ```
 
 FINAL NOTE: In the zstash code, the tar file `MINSIZE` parameter is taken

tests/integration/bash_tests/run_from_chrysalis/blocking_test_scripts/gen_data.sh

@@ -1,62 +1,74 @@
 #!/bin/bash
 
-if [[ $# -lt 1 ]]; then
-    echo "Usage:  text_zstash_blocking.sh (BLOCKING|NON_BLOCKING)"
-    echo "  One of \"BLOCKING\" or \"NON_BLOCKING\" must be supplied as the"
-    echo "  first parameter."
-    exit 0
-fi
-
-NON_BLOCKING=1
-
-if [[ $1 == "BLOCKING" ]]; then
-    NON_BLOCKING=0
-elif [[ $1 == "NON_BLOCKING" ]]; then
-    NON_BLOCKING=1
-else
-    echo "ERROR: Must supply \"BLOCKING\" or \"NON_BLOCKING\" as 1st argument."
-    exit 0
-fi
-
-
-base_dir=`pwd`
-base_dir=`realpath $base_dir`
-
-
-# See if we are running the zstash we THINK we are:
-echo "CALLING zstash version"
-zstash version
-echo ""
+# Set up Globus Endpoint UUIDs ################################################
 
 # Selectable Endpoint UUIDs
 ACME1_GCSv5_UUID=6edb802e-2083-47f7-8f1c-20950841e46a
 LCRC_IMPROV_DTN_UUID=15288284-7006-4041-ba1a-6b52501e49f1
 NERSC_HPSS_UUID=9cd89cfd-6d04-11e5-ba46-22000b92c6ec
 
-# 12 piControl ocean monthly files, 49 GB
-SRC_DATA=$base_dir/src_data
-DST_DATA=$base_dir/dst_data
-
 SRC_UUID=$LCRC_IMPROV_DTN_UUID
 DST_UUID=$LCRC_IMPROV_DTN_UUID
 
-# Optional
-TMP_CACHE=$base_dir/tmp_cache
-
-mkdir -p $SRC_DATA $DST_DATA $TMP_CACHE
+# Helper functions ############################################################
+make_test_dirs() {
+    # base_dir=`pwd`
+    # base_dir=`realpath $base_dir`
+    base_dir="/home/ac.forsyth2/ez/zstash/tests/utils/test_blocking/"
+
+    # 12 piControl ocean monthly files, 49 GB
+    SRC_DATA=$base_dir/src_data
+    DST_DATA=$base_dir/dst_data
+
+    mkdir -p $SRC_DATA $DST_DATA
+}
+
+generate_test_data() {
+    i=1
+    len=1000000 # in bytes
+    while [[ $i -lt 12 ]]; do
+        out=small_0${i}_1M
+        head -c $len </dev/urandom >$out
+        i=$((i+1))
+    done
+}
+
+snapshot() {
+    echo "dst_data:"
+    ls -l $DST_DATA
+
+    echo ""
+    echo "src_data/zstash:"
+    ls -l $SRC_DATA/zstash
+}
+
+remove_test_dirs() {
+    rm -rf "$SRC_DATA/zstash/"
+    rm -f "$DST_DATA"/*
+}
+
+# Run tests ###################################################################
 
 # Make maxsize 1 GB. This will create a new tar after every 1 GB of data.
 # (Since individual files are 4 GB, we will get 1 tarfile per datafile.)
+MAXSIZE=1  # GB
 
-if [[ $NON_BLOCKING -eq 1 ]]; then
-    echo "TEST: NON_BLOCKING:"
-    zstash create -v --hpss=globus://$DST_UUID/$DST_DATA --maxsize 1 --non-blocking $SRC_DATA
-else
-    echo "TEST: BLOCKING:"
-    zstash create -v --hpss=globus://$DST_UUID/$DST_DATA --maxsize 1 $SRC_DATA
-    # zstash create -v --hpss=globus://$DST_UUID --maxsize 1 --non-blocking --cache $TMP_CACHE $SRC_DATA
-fi
+remove_test_dirs # Start fresh
 
-echo "Testing Completed"
+echo "TEST: NON_BLOCKING"
+make_test_dirs
+generate_test_data
+time zstash create -v --hpss=globus://$DST_UUID/$DST_DATA --maxsize ${MAXSIZE} --non-blocking $SRC_DATA
+snapshot
+remove_test_dirs
 
+echo "TEST: BLOCKING"
+make_test_dirs
+generate_test_data
+time zstash create -v --hpss=globus://$DST_UUID/$DST_DATA --maxsize ${MAXSIZE} $SRC_DATA
+snapshot
+remove_test_dirs
+
+echo "Testing Completed"
+echo "Go to https://app.globus.org/activity to confirm Globus transfers completed successfully."
 exit 0