From ce546ecfca24f2b7717c6cffda5ad6b87713ce0d Mon Sep 17 00:00:00 2001
From: Philip Meulengracht <philip.meulengracht@canonical.com>
Date: Mon, 5 Aug 2024 12:02:18 +0200
Subject: [PATCH] tests: change tests to not require a priveliged container

---
 spread.yaml                                |  3 +--
 tests/spread/integration/mount/test.sh     | 25 ++++++++++++----------
 tests/spread/integration/systemd/task.yaml |  6 ------
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/spread.yaml b/spread.yaml
index aa3205684..1ddafa8e4 100644
--- a/spread.yaml
+++ b/spread.yaml
@@ -17,8 +17,7 @@ backends:
       echo "Allocating $SPREAD_SYSTEM..."
       docker_image=$(echo $SPREAD_SYSTEM | awk -F '-' '{print $1":"$2}')
       docker_arch=$(echo $SPREAD_SYSTEM | awk -F '-' '{print $NF}')
-      docker run --cap-add SYS_ADMIN --security-opt apparmor=unconfined \
-        --rm -e DEBIAN_FRONTEND=noninteractice \
+      docker run --rm -e DEBIAN_FRONTEND=noninteractice \
         -e usr=$SPREAD_SYSTEM_USERNAME -e pass=$SPREAD_SYSTEM_PASSWORD \
         --name $SPREAD_SYSTEM -d $docker_arch/$docker_image sh -c '
         set -x
diff --git a/tests/spread/integration/mount/test.sh b/tests/spread/integration/mount/test.sh
index 922ca1166..2f0dd6f01 100755
--- a/tests/spread/integration/mount/test.sh
+++ b/tests/spread/integration/mount/test.sh
@@ -1,14 +1,17 @@
 #!/bin/bash
 
-# Run a smoke test for mount and umount to verify that
-# they are doing what we expect by testing on /proc
+# simple smoke test that it loads
+mount --help
+
+cat > /etc/fstab <<EOF
+# test on a chrooted env, but let us make sure it exists
+EOF
+
+# Do not do the actually mounting syscall as that will
+# be blocked inside the docker container. We do dry-runs
+# instead to ensure that the rest of the binary looks ok
 mkdir /test-bin
-mount --bind /bin /test-bin
-count=$(ls /test-bin | wc -l)
-umount /test-bin
-
-if [ $count -eq 0 ]
-then
-    echo "no files in /test-bin, did mount not work?"
-    exit 1
-fi
+mount --fake --bind /bin /test-bin
+
+# we cannot test the 'mount -l' without mounting /proc
+# as it is a symlink from /etc/mtab to ../proc/self/mounts
diff --git a/tests/spread/integration/systemd/task.yaml b/tests/spread/integration/systemd/task.yaml
index d77145ad9..3d5e8f030 100644
--- a/tests/spread/integration/systemd/task.yaml
+++ b/tests/spread/integration/systemd/task.yaml
@@ -5,11 +5,5 @@ execute: |
   # test in.
   rootfs="$(install-slices bash_bins coreutils_bins passwd_config base-files_base systemd_bins)"
   
-  # systemd needs proc mounted
-  mkdir "${rootfs}"/proc
-  mount --bind /proc "${rootfs}"/proc
-
   cp test.sh "${rootfs}/"
   chroot "${rootfs}/" /test.sh
-
-  umount "${rootfs}"/proc