Merge pull request #7151 from zyga/fix/leaky-test-i

tests: remove local revision of core
canonical · Jul 25, 2019 · c7f8c5e · c7f8c5e
2 parents 5399f62 + 21b28db
commit c7f8c5e
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/tests/main/snap-userd-reexec/task.yaml b/tests/main/snap-userd-reexec/task.yaml
@@ -15,3 +15,11 @@ execute: |
     echo "Ensure the dbus service file got created"
     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: |
+    #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