[_362][_3} fix test setup conditions

Author: d-w-moore

irods/test/PRC_issue_362.bats

@@ -4,40 +4,36 @@
 . $BATS_TEST_DIRNAME/scripts/funcs
 
 setup() {
-  [ $BATS_TEST_NUMBER = 1 ] && echo "---" >/tmp/PRC_test_issue_362
-  local name=${BATS_TEST_DESCRIPTION##*_}
-
-  ## Arrange for secrets file to be generated internally by the Python client
-  cat >~/.python_irodsclient <<-EOF
-	legacy_auth.pam.store_password_to_environment True
-	legacy_auth.pam.password_for_auto_renew 'my${CHR}pass'
-	legacy_auth.pam.time_to_live_in_hours 1
-	EOF
 
   iinit_as_rods
 
-  if [ ! -e /tmp/rodsuser_alissa_created ]; then
-      iadmin mkuser alissa rodsuser
-  fi
-  touch /tmp/rodsuser_alissa_created
-
-  _begin_pam_environment_and_password "" alissa
-  rm -f ~/.irods/.irodsA
+  setup_pam_login_for_user "test123" alice
 
   cat >~/test_get_home_coll.py <<-EOF
 	import irods.test.helpers as h
 	ses = h.make_session()
 	home_coll = h.home_collection(ses)
 	exit(0 if ses.collections.get(home_coll).path == home_coll
-	       and ses.pool.account._original_authentication_scheme.lower().startswith('pam')
+	       and ses.pool.account._original_authentication_scheme.lower() in ('pam','pam_password')
 	     else 1)
 	EOF
 }
 
+teardown() {
+  iinit_as_rods
+  finalize_pam_login_for_user alice
+}
+
 prc_test()
 {
   local CHR="$1"
-  local USER="alissa"
+  ## Arrange for secrets file to be generated internally by the Python client
+  cat >~/.python_irodsclient <<-EOF
+	legacy_auth.pam.store_password_to_environment True
+	legacy_auth.pam.password_for_auto_renew 'my${CHR}pass'
+	legacy_auth.pam.time_to_live_in_hours 1
+	EOF
+  local USER="alice"
   local PASSWORD="my${CHR}pass"
   sudo chpasswd <<<"$USER:$PASSWORD"
   env PYTHON_IRODSCLIENT_CONFIGURATION_PATH='' python ~/test_get_home_coll.py