tests: check before removing local core

Signed-off-by: Zygmunt Krynicki <[email protected]>
canonical · Jul 24, 2019 · 21b28db · 21b28db
1 parent 3d075f7
commit 21b28db
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/tests/main/snap-userd-reexec/task.yaml b/tests/main/snap-userd-reexec/task.yaml
@@ -16,5 +16,10 @@ execute: |
     test -f /usr/share/dbus-1/services/io.snapcraft.Launcher.service
     diff -u /usr/share/dbus-1/services/io.snapcraft.Launcher.service.orig /usr/share/dbus-1/services/io.snapcraft.Launcher.service
 restore: |
-    snap revert core
-    snap remove --revision=x1 core
+    #shellcheck source=tests/lib/dirs.sh
+    . "$TESTSLIB"/dirs.sh
+    # Remove the locale revision of core, if we installed one.
+    if [ "$(readlink "$SNAP_MOUNT_DIR/core/current")" = x1 ]; then
+        snap revert core
+        snap remove --revision=x1 core
+    fi