bats tests - IRODS version macros, params

d-w-moore · d-w-moore · commit 24c710e0cfe9 · 2025-09-23T09:51:28.000-04:00
diff --git a/irods/test/harness/000_install-irods.Dockerfile b/irods/test/harness/000_install-irods.Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 COPY install.sh /
 ARG irods_package_version
 ENV IRODS_PACKAGE_VERSION "$irods_package_version"
diff --git a/irods/test/harness/install.sh b/irods/test/harness/install.sh
@@ -116,10 +116,10 @@ ________"
     ;;
 
  4)
-   IRODS_TO_INSTALL=`irods_package_version`
-   sudo apt install -y irods-{dev,runtime}${IRODS_TO_INSTALL=:+"=$IRODS_TO_INSTALL="}
+   IRODS_TO_INSTALL=`irods_package_vsn`
+   sudo apt install -y irods-{dev,runtime}${IRODS_TO_INSTALL:+"=$IRODS_TO_INSTALL"}
    if [[ $with_opts != *\ basic\ * ]]; then
-     sudo apt install -y irods-{icommands,server,database-plugin-postgres}${IRODS_TO_INSTALL=:+"=$IRODS_TO_INSTALL="}
+     sudo apt install -y irods-{icommands,server,database-plugin-postgres}${IRODS_TO_INSTALL:+"=$IRODS_TO_INSTALL"}
    fi
  ;;
 
diff --git a/irods/test/harness/test_script_parameters b/irods/test/harness/test_script_parameters
@@ -3,7 +3,7 @@
 declare -A wrapper_arglist=(
     [demo.sh]="arg1 arg2"
     [demo_A.sh]="arg1-a arg2-a"
-    [login_auth_test.py]="TestLogins"
+    [login_auth_test_must_run_manually.py]="-v TestLogins"
     [login_auth_test_1.py]="-v TestAnonymousUser TestMiscellaneous"
     [login_auth_test_2.py]="-v TestWithSSL"
 )

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ubuntu:20.04`
	`1`	`+FROM ubuntu:22.04`
`2`	`2`	`COPY install.sh /`
`3`	`3`	`ARG irods_package_version`
`4`	`4`	`ENV IRODS_PACKAGE_VERSION "$irods_package_version"`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`declare -A wrapper_arglist=(`
`4`	`4`	`[demo.sh]="arg1 arg2"`
`5`	`5`	`[demo_A.sh]="arg1-a arg2-a"`
`6`		`- [login_auth_test.py]="TestLogins"`
	`6`	`+ [login_auth_test_must_run_manually.py]="-v TestLogins"`
`7`	`7`	`[login_auth_test_1.py]="-v TestAnonymousUser TestMiscellaneous"`
`8`	`8`	`[login_auth_test_2.py]="-v TestWithSSL"`
`9`	`9`	`)`