force pw prompt

Author: d-w-moore

irods/test/scripts/test012_pam_interactive_multistep.bats

@@ -3,7 +3,7 @@
 # The tests in this BATS module must be run as a (passwordless) sudo-enabled user.
 # It is also required that the python irodsclient be installed under irods' ~/.local environment.
 
-#SKIP_IINIT_FOR_PASSWORD=yes
+SKIP_IINIT_FOR_PASSWORD=yes
 
 . $BATS_TEST_DIRNAME/test_support_functions
 
@@ -30,9 +30,9 @@ setup() {
 
       sudo apt install irods-auth-plugin-pam-interactive-{client,server}
 
-      export IINIT_TTL=100
       setup_pam_login_for_user "${FIRST_PASSWORD}" $TESTUSER
-      sudo cp $BATS_TEST_DIRNAME/files_for_test012/pam_interactive /etc/pam.d/irods
+      sudo cp $BATS_TEST_DIRNAME/files_for_test012/pam_password    /etc/pam.d/irods
+      sudo cp $BATS_TEST_DIRNAME/files_for_test012/pam_interactive /etc/pam.d/
       sudo mkdir /t012 && sudo gcc -o /t012/pam_clear_token.so -fno-stack-protector -shared -fPIC $BATS_TEST_DIRNAME/files_for_test012/pam_clear_token.c
 
       db_file=/t012/pam_userdb.db
@@ -57,6 +57,7 @@ import getpass
 import irods
 import os
 from unittest.mock import patch
+from irods.auth import FORCE_PASSWORD_PROMPT
 
 def getpass_new_callable(answers=()):
     class iterate_answers:
@@ -78,6 +79,7 @@ with patch(
     new_callable=getpass_new_callable(answers=[os.environ['FIRST_PASSWORD'],os.environ['SECOND_PASSWORD']])
 ):
     sess = irods.helpers.make_session(test_server_version=False)
+    sess.set_auth_option_for_scheme('pam_interactive', FORCE_PASSWORD_PROMPT, True)
     home = sess.collections.get(f'/{sess.zone}/home/{sess.username}')
 
 if home is None: