File tree Expand file tree Collapse file tree 2 files changed +13
-189
lines changed Expand file tree Collapse file tree 2 files changed +13
-189
lines changed Original file line number Diff line number Diff line change @@ -61,8 +61,9 @@ run_test_cases()
6161
6262 PERLMUTTER_ENDPOINT=6bdc7956-fc0f-4ad2-989c-7aa5ee643a79
6363
64+ TRY_NUM=8
6465 SRC_DIR=/lcrc/group/e3sm/ac.forsyth2/zstash_testing/test_globus_auth # Chrysalis
65- DST_DIR=globus://${PERLMUTTER_ENDPOINT} /global/homes/f/forsyth/zstash/tests/test_globus_auth_try5
66+ DST_DIR=globus://${PERLMUTTER_ENDPOINT} /global/homes/f/forsyth/zstash/tests/test_globus_auth_try ${TRY_NUM}
6667
6768 GLOBUS_CFG=/home/ac.forsyth2/.globus-native-apps.cfg
6869 INI_PATH=/home/ac.forsyth2/.zstash.ini
@@ -120,6 +121,17 @@ run_test_cases()
120121 check_log_does_not_have " Please go to this URL and login:" ${case_name} .log # There should be no login prompts for run2!
121122 # From save_tokens
122123 check_log_does_not_have " INFO: Tokens saved successfully" ${case_name} .log # Differs from run1
124+
125+ # This part replaces the original test_globus.py `testLs` function.
126+ zstash ls --hpss=${DST_DIR} /run1 2>&1 | tee run1_ls.log
127+ check_log_has " file_empty.txt" run1_ls.log
128+ check_log_has " dir/file0.txt" run1_ls.log
129+ check_log_has " empty_dir" run1_ls.log
130+ zstash ls --hpss=${DST_DIR} /run2 2>&1 | tee run2_ls.log
131+ check_log_has " file_empty.txt" run2_ls.log
132+ check_log_has " dir/file0.txt" run2_ls.log
133+ check_log_has " empty_dir" run2_ls.log
134+ # Could also test -l and -v options, but the above code covers the important part.
123135}
124136
125137run_test_cases
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments