tests/main: account for opensuse defaulting to /var/lib/snapd/snap

Signed-off-by: Maciej Borzecki <maciej.borzecki@canonical.com>

Author: bboozzoo

tests/main/debug-execution/task.yaml

@@ -164,20 +164,13 @@ execute: |
             # MATCH 'is-reexecd: false' < snap-yes-reexec.out
             # MATCH 'self-exe: /snap/snapd/.*/usr/bin/snap' < snap-yes-reexec.out
             case "$SPREAD_SYSTEM" in
-                arch-linux-*|fedora-*|centos-*)
+                arch-linux-*|fedora-*|centos-*|opensuse-*)
                     # no /snap -> /var/lib/snapd/snap symlink by default
                     MATCH 'is-reexecd: false' < snap-yes-reexec.out
                     MATCH 'self-exe: /usr/bin/snap' < snap-yes-reexec.out
 
                     MATCH 'is-reexecd: false' < snap-force-reexec.out
                     ;;
-                opensuse-*)
-                    # snap mount dir is /snap
-                    MATCH 'is-reexecd: true' < snap-yes-reexec.out
-                    MATCH 'self-exe: /snap/snapd/.*/usr/bin/snap' < snap-yes-reexec.out
-
-                    MATCH 'is-reexecd: true' < snap-force-reexec.out
-                    ;;
                 amazon-linux-*)
                     # has /snap -> /var/lib/snapd symlink
                     MATCH 'is-reexecd: true' < snap-yes-reexec.out
@@ -208,15 +201,9 @@ execute: |
                 *)
                     # arch and opensuse have AppArmor installed
                     MATCH 'apparmor-parser: (/usr)?/sbin/apparmor_parser' < snap-apparmor-default.out
-                    case "$SPREAD_SYSTEM" in
-                        opensuse-*)
-                            MATCH 'internal: true' < snap-apparmor-force-reexec.out
-                            ;;
-                        *)
-                            # arch has no /snap -> /var/lib/snapd/snap symlink
-                            MATCH 'internal: false' < snap-apparmor-force-reexec.out
-                            ;;
-                    esac
+                    # no /snap -> /var/lib/snapd/snap symlink on Arch or openSUSE
+                    MATCH 'internal: false' < snap-apparmor-force-reexec.out
+                    ;;
             esac
             MATCH 'internal: false' < snap-apparmor-default.out
 

tests/main/graphical-user-daemons/task.yaml

@@ -13,14 +13,8 @@ restore: |
     snap set system experimental.user-daemons=false
 
 execute: |
-    case "$SPREAD_SYSTEM" in
-        amazon-*|arch-*|centos-*|fedora-*)
-            SNAP_BIN="/var/lib/snapd/snap/bin"
-            ;;
-        *)
-            SNAP_BIN="/snap/bin"
-            ;;
-    esac
+    SNAP_MOUNT_DIR="$(os.paths snap-mount-dir)"
+    SNAP_BIN="$SNAP_MOUNT_DIR/bin"
 
     echo "Test that the non-daemon apps have binaries"
     test -L "$SNAP_BIN"/test-snapd-graphical-user-daemons.normal

tests/main/migrate-snap-mount-dir/task.yaml

@@ -14,6 +14,18 @@ prepare: |
     SNAP_MOUNT_DIR="$(os.paths snap-mount-dir)"
     echo "$SNAP_MOUNT_DIR" > start-mount-dir
 
+    if [ "$SNAP_MOUNT_DIR" != "/snap" ]; then
+        # openSUSE supports both locations, but defaults to /var/lib/snapd/snap
+        tests.systemd stop-unit snapd.service
+        echo "Ensure all snaps are gone"
+        snapd.tool exec snap-mgmt --purge
+
+        mkdir -p /snap
+
+        systemctl start snapd.service
+        snap wait system seed.loaded
+    fi
+
     snap set system experimental.user-daemons=true
     # although state reset should clean that up
     tests.cleanup defer snap unset system experimental.user-daemons