File tree Expand file tree Collapse file tree 3 files changed +8
-22
lines changed
integration/bash_tests/run_from_chrysalis/blocking_test_scripts Expand file tree Collapse file tree 3 files changed +8
-22
lines changed Original file line number Diff line number Diff line change @@ -100,7 +100,11 @@ time ./symlinks.sh # NOTE: you will have to change out paths for your username
100100# real 0m1.346s
101101# No errors
102102
103- # TODO: Handle blocking_test_scripts
103+ cd blocking_test_scripts
104+ # Review README_TEST_BLOCKING
105+ # This uses "12 piControl ocean monthly files, 49 GB",
106+ # so processing may take a long time.
107+ # TODO (later PR): Confirm this test works
104108```
105109
106110## Testing with GitHub Actions
Original file line number Diff line number Diff line change @@ -67,15 +67,7 @@ II. Running the Test Script
6767
6868The test script "test_zstash_blocking.sh" accepts two positional parameters:
6969
70- test_zstash_blocking.sh (BLOCKING|NON_BLOCKING) [NEW_CREDS]
71-
72- On an initial run, or whenever Globus complains of authentication failures,
73- add "NEW_CREDS" as the second parameter. This will act to delete your
74- cached Globus credentials and trigger prompts for you to paste login URLs
75- to your browser (generally one per endpoint) which requires that you conduct
76- a login sequence, and then paste a returned key-value at the bash command
77- prompt. After both keys are accepted, you can re-run the test script
78- without "NEW_CREDS", until the credentials expire (usually 24 hours.)
70+ test_zstash_blocking.sh (BLOCKING|NON_BLOCKING)
7971
8072If "BLOCKING" is selected, zstash will run in default mode, waiting for
8173each tar file to complete transfer before generating another tar file.
@@ -93,7 +85,7 @@ so that your command prompt returns and you can monitor progress with
9385 snapshot.sh
9486
9587which will provide a view of both the tarfile cache and the destination
96- directory for delivred tar files. It is also suggested that you name your
88+ directory for delivered tar files. It is also suggested that you name your
9789logfile to reflect the date, and whether BLOCKING or not was specified.
9890
9991
Original file line number Diff line number Diff line change 11#! /bin/bash
22
33if [[ $# -lt 1 ]]; then
4- echo " Usage: text_zstash_blocking.sh (BLOCKING|NON_BLOCKING) [NEW_CREDS] "
4+ echo " Usage: text_zstash_blocking.sh (BLOCKING|NON_BLOCKING)"
55 echo " One of \" BLOCKING\" or \" NON_BLOCKING\" must be supplied as the"
66 echo " first parameter."
7- echo " Add \" NEW_CREDS\" if Globus credentials have expired."
8- echo " This will cause Globus to prompt for new credentials."
97 exit 0
108fi
119
2018 exit 0
2119fi
2220
23- # remove old auth data, if exists, so that globus will prompt us
24- # for new auth credentials in case they have expired:
25- if [[ $# -gt 1 ]]; then
26- if [[ $2 == " NEW_CREDS" ]]: then
27- rm -f ~ /.globus-native-apps.cfg
28- fi
29- fi
30-
3121
3222base_dir=` pwd`
3323base_dir=` realpath $base_dir `
You can’t perform that action at this time.
0 commit comments