fixup! utils: Rewrite run-tests.sh to use functions and extenal scripts

rjeffman · Jul 15, 2024 · c3a15b3 · c3a15b3
1 parent 8f3899c
commit c3a15b3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/utils/run-tests.sh b/utils/run-tests.sh
@@ -28,9 +28,9 @@ positional arguments:
 
 optional arguments:
   -h              display this message and exit
-  -a              Do not install Ansible, use host's provided one.
-  -A ANSIBLE      Ansible version to use, e.g. "ansible-core==2.16.0"
+  -a ANSIBLE      Ansible version to use, e.g. "ansible-core==2.16.0"
                   (default: latest ansible-core for the python version)
+  -A              Do not install Ansible, use host's provided one.
   -c CONTAINER    use container CONTAINER to run tests
   -K              keep container, even if tests succeed
   -l              list available images
@@ -73,15 +73,15 @@ unset ANSIBLE_VERSION
 
 # Process command options
 
-while getopts ":haa:Ac:ei:Klm:p:s:S:vx" option
+while getopts ":ha:Ac:ei:Klm:p:s:S:vx" option
 do
     case "$option" in
         h) help && exit 0 ;;
-	A)
+        A)
            [ -n "${ANSIBLE_VERSION:-""}" ] && die "Can't use -A with '-a'"
            SKIP_ANSIBLE="YES"
            ;;
-	a) 
+        a) 
            [ "${SKIP_ANSIBLE:-"no"}" == "YES" ] && die "Can't use -A with '-a'"
            ANSIBLE_VERSION="${OPTARG}"
            ;;
@@ -91,7 +91,7 @@ do
         K) STOP_CONTAINER="N" ;;
         l) "${SCRIPTDIR}"/setup_test_container.sh -l && exit 0 || exit 1 ;;
         m) MEMORY="${OPTARG}" ;;
-	p) ansible_interpreter="${OPTARG}" ;;
+        p) ansible_interpreter="${OPTARG}" ;;
         s)
            [ ${SPLITS} -ne 0 ] && die -u "Can't use '-S' with '-s'"
            if [ -d "${TOPDIR}/tests/${OPTARG}" ]

diff --git a/utils/setup_test_container.sh b/utils/setup_test_container.sh
@@ -107,19 +107,21 @@ log info "Testing kinit with admin."
 # shellcheck disable=SC2154
 log info "Creating inventory."
 make_inventory "${scenario}" "${engine}" "${ansible_interpreter:-"/usr/bin/python3"}"
-if [ -z "${inventory}" ]
+if [ -z "${inventory:-''}" ]
 then
     log error "Could not create inventory file."
 else
+    # shellcheck disable=SC2154
     log info "Inventory path: [${inventory}]"
     # shellcheck disable=SC2154
     log debug "$(cat "${inventory}")"
     if [ "${ansible_test}" == "yes" ]
     then
-       log info "Testing Asnible connection."
-       run_if_exists ansible_ping "${inventory}"
-       log info "Querying installed software"
-       run_if_exists query_container_installed_software
+        log info "Testing Ansible connection."
+        # shellcheck disable=SC2154
+        run_if_exists ansible_ping "${inventory}"
+        log info "Querying installed software"
+        run_if_exists query_container_installed_software
     fi
 fi