clearer variable names, unlikely to collide with uses in iRODS and/or OS.

Author: d-w-moore

irods/test/scripts/test002.bats

@@ -10,12 +10,12 @@ PYTHON=python3
 # Run as ubuntu user with sudo; python_irodsclient must be installed (in either ~/.local or a virtualenv)
 #
 
-OLD_PAM_PASSWD="test123"
-NEW_PAM_PASSWD="new_pass"
+ALICES_OLD_PAM_PASSWD="test123"
+ALICES_NEW_PAM_PASSWD="new_pass"
 
 setup()
 {
-    setup_pam_login_for_alice "$OLD_PAM_PASSWD"
+    setup_pam_login_for_alice "$ALICES_OLD_PAM_PASSWD"
 }
 
 teardown()
@@ -27,9 +27,9 @@ teardown()
 @test create_secrets_file {
 
     # Old .irodsA is already created, so we delete it and alter the pam password.
-    sudo chpasswd <<<"alice:$NEW_PAM_PASSWD"
+    sudo chpasswd <<<"alice:$ALICES_NEW_PAM_PASSWD"
     rm -f ~/.irods/.irodsA
-    $PYTHON -c "import irods.client_init; irods.client_init.write_pam_credentials_to_secrets_file('$NEW_PAM_PASSWD')"
+    $PYTHON -c "import irods.client_init; irods.client_init.write_pam_credentials_to_secrets_file('$ALICES_NEW_PAM_PASSWD')"
 
     # Define the core Python to be run, basically a minimal code block ensuring that we can authenticate to iRODS
     # without an exception being raised.

irods/test/scripts/test012.bats

@@ -10,13 +10,13 @@ PYTHON=python3
 # Run as ubuntu user with sudo; python_irodsclient must be installed (in either ~/.local or a virtualenv)
 #
 
-PASSWD=test123
+ALICES_PAM_PASSWORD=test123
 
 setup()
 {
     export SKIP_IINIT_FOR_PASSWORD=1
-    setup_pam_login_for_alice $PASSWD
-    SKIP_IINIT_FOR_PASSWORD=""
+    setup_pam_login_for_alice "$ALICES_PAM_PASSWORD"
+    unset SKIP_IINIT_FOR_PASSWORD
 }
 
 teardown()
@@ -42,7 +42,7 @@ print ('env_auth_scheme=%s' % ses.pool.account._original_authentication_scheme)
 
     # First invocation.  PRC will both authenticate with pam_password, and write the generated secrets to the auth file,
     OUTPUT=$($PYTHON -c "import irods.client_configuration as cfg
-cfg.legacy_auth.pam.password_for_auto_renew = '$PASSWD'
+cfg.legacy_auth.pam.password_for_auto_renew = '$ALICES_PAM_PASSWORD'
 cfg.legacy_auth.pam.time_to_live_in_hours = 1
 cfg.legacy_auth.pam.store_password_to_environment = True
 $SCRIPT")
@@ -54,7 +54,7 @@ $SCRIPT")
 
     # Second invocation.  PRC will use previously generated secrets from the auth file generated in the first invocation.
     OUTPUT=$($PYTHON -c "import irods.client_configuration as cfg
-#cfg.legacy_auth.pam.password_for_auto_renew = '$PASSWD'
+#cfg.legacy_auth.pam.password_for_auto_renew = '$ALICES_PAM_PASSWORD'
 cfg.legacy_auth.pam.time_to_live_in_hours = 1
 cfg.legacy_auth.pam.store_password_to_environment = True
 $SCRIPT")