Skip to content

Commit 6755702

Browse files
committed
rename issue 362 test to test010*
1 parent df64afc commit 6755702

File tree

4 files changed

+20
-14
lines changed

4 files changed

+20
-14
lines changed

.github/workflows/run-bats-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ jobs:
2525

2626
- name: run tests
2727
run: |
28-
for script in ../scripts/test00[1-9]*; do
28+
for script in ../scripts/test[0-9]*; do
2929
./docker_container_driver.sh -V $script
3030
done

irods/test/harness/test_script_parameters

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ declare -A wrappers=(
2020
[test007_pam_features_in_new_auth_framework.bats]=../login_auth_test.sh
2121
[test008_prc_write_irodsA_utility_in_native_mode.bats]=../login_auth_test.sh
2222
[test009_test_special_characters_in_pam_passwords_auth_framework.bats]=../login_auth_test.sh
23+
[test010_issue_362_rogue_chars_in_pam_password.bats]=../login_auth_test.sh
2324
)
2425

2526
# keys for Image and User refer to the basename after resolution to a wrapper if one is used

irods/test/login_auth_test.sh

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ fi
4646
update_json_file $LOCAL_ACCOUNT_ENV_FILE \
4747
"$(newcontent $LOCAL_ACCOUNT_ENV_FILE ssl_keys encrypt_keys)"
4848

49-
if [ $server_hup = y ]; then
49+
if [ "$server_hup" = y ]; then
5050
# wait for server to be ready after configuration reload
5151
while true; do
5252
sleep 2
@@ -60,15 +60,18 @@ if [ $server_hup = y ]; then
6060
done
6161
fi
6262

63-
original_script=/prc/$ORIGINAL_SCRIPT_RELATIVE_TO_ROOT
64-
65-
# Run tests.
66-
if [ -x "$original_script" ]; then
67-
command "$original_script" $*
68-
elif [[ $original_script =~ \.py$ ]]; then
69-
python "$original_script" $*
70-
elif [[ $original_script =~ \.bats$ ]]; then
71-
bats "$original_script"
72-
else
73-
echo >&2 "I don't know how to run this: original_script=[$original_script]"
63+
if [ -n "$ORIGINAL_SCRIPT_RELATIVE_TO_ROOT" ]; then
64+
original_script=/prc/$ORIGINAL_SCRIPT_RELATIVE_TO_ROOT
65+
66+
# Run tests.
67+
if [ -x "$original_script" ]; then
68+
command "$original_script" $*
69+
elif [[ $original_script =~ \.py$ ]]; then
70+
python "$original_script" $*
71+
elif [[ $original_script =~ \.bats$ ]]; then
72+
bats "$original_script"
73+
else
74+
echo >&2 "I don't know how to run this: original_script=[$original_script]"
75+
fi
76+
7477
fi

irods/test/PRC_issue_362.bats renamed to irods/test/scripts/test010_issue_362_rogue_chars_in_pam_password.bats

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
#!/usr/bin/env bats
2+
13
# The tests in this BATS module must be run as a (passwordless) sudo-enabled user.
24
# It is also required that the python irodsclient be installed under irods' ~/.local environment.
35

4-
. $BATS_TEST_DIRNAME/scripts/test_support_functions
6+
. $BATS_TEST_DIRNAME/test_support_functions
57

68
setup() {
79

0 commit comments

Comments
 (0)