Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ mkdir zstash_demo; echo 'file0 stuff' > zstash_demo/file0.txt
zstash create --hpss=globus://6bdc7956-fc0f-4ad2-989c-7aa5ee643a79//global/homes/f/forsyth/zstash/tests/test_database_corruption_setup23 zstash_demo
# You'll have to paste an auth code here, but NOT during the database_corruption test.
rm -rf zstash_demo/
# Then, increment `try_num` below to avoid using an old directory.
# Then, set a unique_id below to avoid using an old directory.
# Alternatively, start fresh by deleting the directory on Perlmutter:
# `rm -rf /global/homes/f/forsyth/zstash/tests/test_database_corruption_try{try_num}`
time ./database_corruption.bash try_num # NOTE: you will have to change out paths for your username
# `rm -rf /global/homes/f/forsyth/zstash/tests/test_database_corruption_{unique_id}`
time ./database_corruption.bash unique_id # NOTE: you will have to change out paths for your username
# Success count: 25
# Fail count: 0
# real 6m43.994s
Expand Down
22 changes: 12 additions & 10 deletions tests/integration/bash_tests/run_from_any/globus_auth.bash
Original file line number Diff line number Diff line change
Expand Up @@ -298,18 +298,18 @@ test_different_endpoint3()
# pic#compy-dtn will only transfer to/from /compyfs/...

# Command line parameters:
try_num="$1"
unique_id="$1"
src_machine="$2" # chrysalis, perlmutter, compy
path_to_repo="$3" # /home/ac.forsyth2/ez/zstash, /global/homes/f/forsyth/ez/zstash, /qfs/people/fors729/ez/zstash
chrysalis_dst_basedir="$4" # /home/ac.forsyth2/zstash_tests
perlmutter_dst_basedir="$5" # /global/homes/f/forsyth/zstash_tests
hpss_dst_basedir="$6" # /home/f/forsyth/zstash_tests
compy_dst_basedir="$7" # /compyfs/fors729/zstash_tests (/qfs/people/fors729/ => permission denied)

chrysalis_dst_dir=${chrysalis_dst_basedir}/test_globus_auth_try${try_num}
perlmutter_dst_dir=${perlmutter_dst_basedir}/test_globus_auth_try${try_num}
hpss_dst_dir=${hpss_dst_basedir}/test_globus_auth_try${try_num}
compy_dst_dir=${compy_dst_basedir}/test_globus_auth_try${try_num}
chrysalis_dst_dir=${chrysalis_dst_basedir}/test_globus_auth_${unique_id}
perlmutter_dst_dir=${perlmutter_dst_basedir}/test_globus_auth_${unique_id}
hpss_dst_dir=${hpss_dst_basedir}/test_globus_auth_${unique_id}
compy_dst_dir=${compy_dst_basedir}/test_globus_auth_${unique_id}

# Determine which endpoints to use for the endpoint-switching tests
# switch1 should never be the last-tested endpoint (i.e., compy)
Expand Down Expand Up @@ -346,9 +346,9 @@ echo "Compy: rm -rf ${compy_dst_basedir}/test_globus_auth*"
echo "This won't work on HPSS, because -rf flags are unsupported:"
echo "NERSC HPSS: rm -rf ${hpss_dst_basedir}/test_globus_auth*"
echo ""
echo "It is therefore advisable to just increment a 'try number' to avoid directory conflicts."
echo "Currently, try_num=${try_num}"
if ! confirm "Is the try_num correct?"; then
echo "It is therefore advisable to just set a unique_id to avoid directory conflicts."
echo "Currently, unique_id=${unique_id}"
if ! confirm "Is the unique_id correct?"; then
exit 1
fi

Expand All @@ -362,8 +362,10 @@ echo "Primary tests: single authentication code tests for each endpoint"
echo "If a test hangs, check if https://app.globus.org/activity reports any errors on your transfers."
echo "Testing transfer to LCRC Improv DTN ####################################"
test_single_auth_code ${path_to_repo} LCRC_IMPROV_DTN_ENDPOINT ${chrysalis_dst_dir}
echo "Testing transfer to NERSC Perlmutter ###################################"
test_single_auth_code ${path_to_repo} NERSC_PERLMUTTER_ENDPOINT ${perlmutter_dst_dir}
if [ "$src_machine" != "perlmutter" ]; then
echo "Testing transfer to NERSC Perlmutter ###################################"
test_single_auth_code ${path_to_repo} NERSC_PERLMUTTER_ENDPOINT ${perlmutter_dst_dir}
fi
Comment on lines +365 to +368
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was running in to login problems while testing Perlmutter transferring to Perlmutter. I thought I had done that successfully before, but in any case, I don't really think this is an important case to worry about testing (i.e., there's not much of a need to Globus transfer files to the same machine).

echo "Testing transfer to NERSC HPSS #########################################"
test_single_auth_code ${path_to_repo} NERSC_HPSS_ENDPOINT ${hpss_dst_dir}
echo "Testing transfer to pic#compy-dtn ######################################"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ setup()
run_test_cases()
{

local try_num=$1
local unique_id=$1

SRC_DIR=/lcrc/group/e3sm/ac.forsyth2/zstash_testing/test_database_corruption # Chrysalis
DST_DIR=globus://6bdc7956-fc0f-4ad2-989c-7aa5ee643a79/global/homes/f/forsyth/zstash/tests/test_database_corruption_try${try_num} # Perlmutter
# To start fresh with try_num=1, delete the above directory on Perlmutter before running. Example:
# rm -rf /global/homes/f/forsyth/zstash/tests/test_database_corruption_try1
DST_DIR=globus://6bdc7956-fc0f-4ad2-989c-7aa5ee643a79/global/homes/f/forsyth/zstash/tests/test_database_corruption_${unique_id} # Perlmutter
# To start fresh, delete the directories on Perlmutter before running. Example:
# rm -rf /global/homes/f/forsyth/zstash/tests/test_database_corruption_<unique_id>

success_count=0
fail_count=0
Expand Down
Loading