From 5d3e0b46753aa1f6d0ddb1f67611a76a008d56db Mon Sep 17 00:00:00 2001
From: Olivier Gayot <olivier.gayot@canonical.com>
Date: Tue, 19 Apr 2022 14:27:11 +0200
Subject: [PATCH] tests: pass the subiquity commands directly without sh -c ''

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
---
 scripts/runtests.sh | 50 +++++++++++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 13 deletions(-)

diff --git a/scripts/runtests.sh b/scripts/runtests.sh
index 91f1a5e0..eca2cf21 100755
--- a/scripts/runtests.sh
+++ b/scripts/runtests.sh
@@ -148,12 +148,20 @@ for answers in examples/answers*.yaml; do
             config=examples/simple.json
         fi
         serial=$(sed -n 's/^#serial/x/p' $answers || true)
-        opts=''
+        opts=()
         if [ -n "$serial" ]; then
-            opts='--serial'
+            opts+=(--serial)
         fi
         # The --foreground is important to avoid subiquity getting SIGTTOU-ed.
-        timeout --foreground 60 sh -c "LANG=C.UTF-8 python3 -m subiquity.cmd.tui --bootloader uefi --answers $answers --dry-run --snaps-from-examples --machine-config $config --output-base $tmpdir $opts" < $tty
+        LANG=C.UTF-8 timeout --foreground 60 \
+            python3 -m subiquity.cmd.tui < "$tty" \
+            --bootloader uefi \
+            --answers "$answers" \
+            --dry-run \
+            --snaps-from-examples \
+            --machine-config "$config" \
+            --output-base "$tmpdir" \
+            "${opts[@]}"
         validate
         grep -q 'finish: subiquity/Install/install/postinstall/run_unattended_upgrades: SUCCESS: downloading and installing security updates' $tmpdir/subiquity-server-debug.log
     else
@@ -166,18 +174,26 @@ for answers in examples/answers*.yaml; do
                 reconf_settings="true"
                 validate_subtype="answers-reconf"
             fi
-            timeout --foreground 60 sh -c "DRYRUN_RECONFIG=$reconf_settings LANG=C.UTF-8 python3 -m system_setup.cmd.tui --answers $answers --output-base $tmpdir --dry-run " < $tty
+            DRYRUN_RECONFIG="$reconf_settings" LANG=C.UTF-8 timeout --foreground 60 \
+                python3 -m system_setup.cmd.tui < "$tty" \
+                --answers "$answers" \
+                --output-base "$tmpdir" \
+                --dry-run
             validate "system_setup" "$validate_subtype"
         fi
     fi
     clean
 done
 
-timeout --foreground 60 sh -c "LANG=C.UTF-8 python3 -m subiquity.cmd.tui --autoinstall examples/autoinstall.yaml \
-                               --dry-run --machine-config examples/existing-partitions.json --bootloader bios \
-                               --kernel-cmdline 'autoinstall' \
-                               --output-base $tmpdir \
-                               --source-catalog=examples/install-sources.yaml"
+LANG=C.UTF-8 timeout --foreground 60 \
+    python3 -m subiquity.cmd.tui \
+    --autoinstall examples/autoinstall.yaml \
+    --dry-run \
+    --machine-config examples/existing-partitions.json \
+    --bootloader bios \
+    --kernel-cmdline autoinstall \
+    --output-base "$tmpdir" \
+    --source-catalog=examples/install-sources.yaml
 validate
 python3 scripts/check-yaml-fields.py $tmpdir/var/log/installer/subiquity-curtin-apt.conf \
         apt.disable_components='[non-free, restricted]' \
@@ -202,9 +218,13 @@ grep -q 'finish: subiquity/Install/install/postinstall/run_unattended_upgrades:
     $tmpdir/subiquity-server-debug.log
 
 clean
-timeout --foreground 60 sh -c "LANG=C.UTF-8 python3 -m subiquity.cmd.tui --autoinstall examples/autoinstall-user-data.yaml \
-                               --output-base $tmpdir \
-                               --dry-run --machine-config examples/simple.json --kernel-cmdline 'autoinstall'"
+LANG=C.UTF-8 timeout --foreground 60 \
+    python3 -m subiquity.cmd.tui \
+    --autoinstall examples/autoinstall-user-data.yaml \
+    --output-base "$tmpdir" \
+    --dry-run \
+    --machine-config examples/simple.json \
+    --kernel-cmdline autoinstall
 validate
 grep -q 'finish: subiquity/Install/install/postinstall/run_unattended_upgrades: SUCCESS: downloading and installing security updates' $tmpdir/subiquity-server-debug.log
 
@@ -212,7 +232,11 @@ grep -q 'finish: subiquity/Install/install/postinstall/run_unattended_upgrades:
 if [ "${RELEASE%.*}" -ge 20 ]; then
     for mode in "" "-full" "-no-shutdown"; do
         clean
-        timeout --foreground 60 sh -c "LANG=C.UTF-8 python3 -m system_setup.cmd.tui --autoinstall examples/autoinstall-system-setup${mode}.yaml --output-base $tmpdir --dry-run"
+        LANG=C.UTF-8 timeout --foreground 60 \
+            python3 -m system_setup.cmd.tui \
+            --autoinstall "examples/autoinstall-system-setup${mode}.yaml" \
+            --output-base "$tmpdir" \
+            --dry-run
         validate "system_setup" "autoinstall${mode}"
     done