Merge ~kzapalowicz/snappy-hwe-snaps/+git/udisks2:fix/adopt-new-aliases into ~snappy-hwe-team/snappy-hwe-snaps/+git/udisks2:master

[Konrad Zapałowicz]

Adopt for new aliases coming with 2.25

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:7e7a806aff166956af61167b83019a18baa5d31c
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1521/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1581/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1428/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1971/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1171/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1521/rebuild

review: Needs Fixing (continuous-integration)

[Simon Fels (morphis)]

LGTM but not sure why tests are failing

review: Approve

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:57483a4a69e7249b5feca9b8a9098ccadfdbab9d
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1524/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1634
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1432/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/2021
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1223/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1524/rebuild

review: Approve (continuous-integration)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index c04a78b..5ad9f43 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -14,6 +14,8 @@ apps:
     udisksctl:
         command: bin/udisksctl.sh
         plugs: [client]
+        # NOTE: This is depreciated with snapd 2.25 however it needs to stay to
+        # guarantee that all clients are updated correctly.
         aliases: [udisksctl]
     udisksd:
         daemon: simple
diff --git a/tests/lib/utilities.sh b/tests/lib/utilities.sh
index 12f7d15..a0c8692 100644
--- a/tests/lib/utilities.sh
+++ b/tests/lib/utilities.sh
@@ -12,6 +12,14 @@ snap_install() {
 		# snap.
 		snap install $name
 		snap install --dangerous $PROJECT_PATH/$name*_amd64.snap
+
+		# Setup all necessary aliases
+		snapd_version=$(snap version | awk '/^snapd / {print $2; exit}')
+		target=$SNAP_NAME.udisksctl
+		if dpkg --compare-versions $snapd_version lt 2.25 ; then
+			target=$SNAP_NAME
+		fi
+		snap alias $target udisksctl
 	fi
 }
 
diff --git a/tests/main/aliases/task.yaml b/tests/main/aliases/task.yaml
index 96f7813..1aebee5 100644
--- a/tests/main/aliases/task.yaml
+++ b/tests/main/aliases/task.yaml
@@ -1,13 +1,4 @@
-summary: Verify aliases provided by the snap are correctly enabled
+summary: Verify aliases are set up
 
 execute: |
-    # FIXME: Aliases should be not in place automatically unless we
-    # have them approved from the store in our snap-declaration assertion.
-    test ! -e /snap/bin/udisksctl
-
-    snap alias udisks2 udisksctl
-
-    test -e /snap/bin/udisksctl
-
-    # Verify the alias works without any problems
-    /snap/bin/udisksctl status
+    test -x /snap/bin/udisksctl