clean debug

Author: d-w-moore

irods/test/harness/test_script_parameters

@@ -15,7 +15,6 @@ declare -A wrappers=(
     [PRC_issue_362.bats]=./login_auth_test.sh
     [demo.sh]=./demo_hook.sh
     [test001_pam_password_expiration.bats]=../login_auth_test.sh
-    [test001.bats]=../login_auth_test.sh
     [test002_write_native_credentials_to_secrets_file.bats]=../login_auth_test.sh
     [test003_write_pam_credentials_to_secrets_file.bats]=../login_auth_test.sh
     [test004_prc_pam_password_internal_secrets_file_generation.bats]=../login_auth_test.sh
@@ -38,12 +37,10 @@ declare -A images=(
     [login_auth_test_must_run_manually.py]=ssl-and-pam
     [demo_hook.sh]=ssl-and-pam
     [run_suite_locally.sh]=compile-specific-python
-    [test000_run_suite_locally.sh]=compile-specific-python
-    [test000.sh]=compile-specific-python
 )
 
 declare -A user=(
-    [test000_run_suite_locally.sh]=root
+    [run_suite_locally.sh]=root
 )
 
 # keys for WorkDir refer to user

irods/test/login_auth_test.sh

@@ -9,11 +9,11 @@ LOCAL_ACCOUNT_ENV_FILE=~/.irods/irods_environment.json
 cannot_iinit=''
 tries=8
 while true; do
-  iinit_as_rods && break
+  iinit_as_rods >/dev/null 2>&1 && break
   [ $((--tries)) -le 0 ] && { cannot_iinit=1; break; }
   sleep 5
 done
-[ -n "$cannot_iinit" ] && { echo >&2 "Could not iinit as rods after repeated attempts."; exit 2; }
+[ -n "$cannot_iinit" ] && { echo >&2 "Could not iinit as rods."; exit 2; }
 
 setup_preconnect_preference DONT_CARE
 
@@ -53,7 +53,7 @@ if [ $server_hup = y ]; then
     if ils >/dev/null 2>&1; then
       break
     else
-      # Allow 16 secs of wait time for server.
+      # Allow ~16 secs of total wait time.
       [ $((++server_check)) -gt 8 ] && {
         echo >&2 "Timed out on server reload"; exit 3; }
     fi