test001 working

Author: d-w-moore

irods/test/harness/test_script_parameters

@@ -12,6 +12,7 @@ declare -A wrapper_arglist=(
 
 declare -A wrappers=(
     [login_auth_test.py]=./login_auth_test.sh
+    [test001_pam_password_expiration.bats]=../login_auth_test.sh
     [demo.sh]=./demo_hook.sh
 )
 

irods/test/login_auth_test.sh

@@ -26,5 +26,12 @@ iinit_as_rods >/dev/null 2>&1 || { echo >&2 "couldn't iinit as rods"; exit 2; }
 update_json_file $LOCAL_ACCOUNT_ENV_FILE \
                  "$(newcontent $LOCAL_ACCOUNT_ENV_FILE ssl_keys encrypt_keys)"
 
+original_script=/prc/$ORIGINAL_SCRIPT_RELATIVE_TO_ROOT
 # Run tests.
-python "/prc/$ORIGINAL_SCRIPT_RELATIVE_TO_ROOT" $*
+if [ -x "$original_script" ]; then 
+  command "$original_script" $*
+elif [[ $original_script =~ \.py$ ]]; then
+  python "$original_script" $*
+else
+  echo >&2 "I don't know how to run this: original_script=[$original_script]"
+fi

irods/test/scripts/funcs

@@ -100,7 +100,9 @@ _begin_pam_environment_and_password() {
     mv ~/.irods ~/.irods.$$
     mkdir ~/.irods
     echo "$ENV" > ~/.irods/irods_environment.json
-    iinit <<<"$1" 2>/dev/tty
+
+    # TODO: check: it seems /dev/tty won't work if docker exec is not invoked with -t
+    iinit <<<"$1" 2>/tmp/iinit_as_alice.log
 }
 
 _end_pam_environment_and_password() {
@@ -147,6 +149,11 @@ age_out_pam_password() {
   sudo su - postgres -c "psql ICAT -c 'update r_user_password set create_ts=$new_time, modify_ts=$new_time where user_id=$id'"
 }
 
+call_irodsctl() {
+    local arg=${1:-restart}
+    sudo su - irods -c "./irodsctl $arg"
+}
+
 add_irods_to_system_pam_configuration() {
     local tempfile=/tmp/irods-pam-config.$$
     cat <<-EOF >$tempfile

irods/test/scripts/test001_pam_password_expiration.bats

@@ -48,7 +48,7 @@ print ('env_auth_scheme=%s' % ses.pool.account._original_authentication_scheme)
     HOME_COLLECTION=$(ipwd)
     sleep 9
     OUTPUT=$($PYTHON -c "$SCRIPT" 2>&1 >/dev/null || true)
-    grep 'RuntimeError: Time To Live' <<<"$OUTPUT"
+    grep 'CAT_PASSWORD_EXPIRED' <<<"$OUTPUT"
 
     # Test that the $SCRIPT, when run with proper settings, can successfully reset the password.