Skip to content

Commit 1648551

Browse files
committed
update BATS test scripts
1 parent cd9f91d commit 1648551

4 files changed

Lines changed: 10 additions & 3 deletions

irods/test/scripts/test002_write_native_credentials_to_secrets_file.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ PYTHON=python3
2121
"irods_zone_name":"tempZone"
2222
}
2323
EOF
24-
$PYTHON -c "import irods.client_init; irods.client_init.write_native_credentials_to_secrets_file('rods')"
24+
$PYTHON -c "import irods.client_init; irods.client_init.write_native_irodsA_file('rods')"
2525

2626
# Define the core Python to be run, basically a minimal code block ensuring that we can authenticate to iRODS
2727
# without an exception being raised.

irods/test/scripts/test003_write_pam_credentials_to_secrets_file.bats

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ teardown()
3333
sudo chpasswd <<<"alice:$ALICES_NEW_PAM_PASSWD"
3434
OUTPUT=$($PYTHON -c "import irods.client_init;
3535
try:
36-
irods.client_init.write_pam_credentials_to_secrets_file('$ALICES_NEW_PAM_PASSWD', overwrite = False)
36+
irods.client_init.write_pam_irodsA_file('$ALICES_NEW_PAM_PASSWD', overwrite = False)
3737
except irods.client_init.irodsA_already_exists:
3838
print ('CANNOT OVERWRITE')
3939
")
@@ -43,7 +43,7 @@ except irods.client_init.irodsA_already_exists:
4343
[ -n "$CONTENTS1" -a "$CONTENTS1" = "$CONTENTS2" ]
4444

4545
# Now delete the already existing irodsA and repeat without negating overwrite.
46-
$PYTHON -c "import irods.client_init; irods.client_init.write_pam_credentials_to_secrets_file('$ALICES_NEW_PAM_PASSWD')"
46+
$PYTHON -c "import irods.client_init; irods.client_init.write_pam_irodsA_file('$ALICES_NEW_PAM_PASSWD')"
4747
CONTENTS3=$(cat $auth_file)
4848
[ "$CONTENTS2" != "$CONTENTS3" ]
4949

irods/test/scripts/test004_prc_pam_password_internal_secrets_file_generation.bats

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ teardown()
2828

2929
@test main {
3030

31+
echo legacy_auth.force_legacy_auth True > ~/.python_irodsclient
32+
export PYTHON_IRODSCLIENT_CONFIGURATION_PATH=""
33+
3134
local AUTH_FILE=~/.irods/.irodsA
3235

3336
# Test assertion: No pre-existing authentication file.

irods/test/scripts/test005_test_special_characters_in_passwords.bats

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ teardown()
2424
}
2525

2626
@test main {
27+
28+
echo legacy_auth.force_legacy_auth True > ~/.python_irodsclient
29+
export PYTHON_IRODSCLIENT_CONFIGURATION_PATH=""
30+
2731
# Old .irodsA is already created, so we delete it and alter the pam password.
2832
sudo chpasswd <<<"alice:$ALICES_NEW_PAM_PASSWD"
2933
local logfile i

0 commit comments

Comments
 (0)