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

[Konrad Zapałowicz]

Adopt for new aliases coming with 2.25

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

See comment

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

FAILED: Continuous integration, rev:e67d981d9ee529cf314136297d70044a1b6b07bc
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1525/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1645/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1433/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/2032/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1234/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:6841aa9c0c08d02032a121b726bc1944fa8ae03c
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1526/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1646
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1434/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/2033
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1235/console

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

review: Approve (continuous-integration)

[Simon Fels (morphis)]

LGTM

review: Approve

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 5309985..edd364d 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -21,8 +21,7 @@ apps:
   mmcli:
     command: bin/mmcli
     plugs: [mmcli]
-    aliases:
-      - mmcli
+    aliases: [mmcli]
   modemmanager:
     command: bin/modemmanager
     daemon: simple
diff --git a/tests/lib/utilities.sh b/tests/lib/utilities.sh
index 519e78c..f756f66 100644
--- a/tests/lib/utilities.sh
+++ b/tests/lib/utilities.sh
@@ -22,13 +22,18 @@ install_snap_under_test() {
 			snap install --$SNAP_CHANNEL $SNAP_NAME
 		fi
 	else
-        # Install first from store to avoid error when performing the connection
-        snap install $SNAP_NAME
+		# Install first from store to avoid error when performing the connection
+		snap install $SNAP_NAME
 		# Install prebuilt snap
 		snap install --dangerous ${PROJECT_PATH}/${SNAP_NAME}_*_${SNAP_ARCH}.snap
 		if [ -n "$SNAP_AUTO_ALIASES" ]; then
+			snapd_version=$(snap version | awk '/^snapd / {print $2; exit}')
 			for alias in $SNAP_AUTO_ALIASES ; do
-				snap alias $SNAP_NAME $alias
+				target=$SNAP_NAME.$alias
+				if dpkg --compare-versions $snapd_version lt 2.25 ; then
+					target=$SNAP_NAME
+				fi
+				snap alias $target $alias
 			done
 		fi
 	fi