Merge ~morphis/snappy-hwe-snaps/+git/pulseaudio:f/adopt-new-aliases into ~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio:master

[Simon Fels]

Adopt for new aliases coming with 2.25

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

FAILED: Continuous integration, rev:6e3e4846ef4ed84a8cb92b3605c51b4c2f78976f
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1511/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1541/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1419/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1931/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1134/console

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

review: Needs Fixing (continuous-integration)

[Konrad Zapałowicz (kzapalowicz)]

lgtm

review: Approve (code)

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

PASSED: Continuous integration, rev:aed3381fcd2692121e5b546ba10afa8570006a8a
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1512/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1542
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1420/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1932
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1135/console

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

review: Approve (continuous-integration)

[Jim Hodapp (jhodapp)]

Two minor things to fix.

review: Needs Fixing

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

PASSED: Continuous integration, rev:6cb9950120668309eeeea1866a34cf4e6e861f99
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1513/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1563
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1421/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1953
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1156/console

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

review: Approve (continuous-integration)

[Konrad Zapałowicz (kzapalowicz)]

t-a because all of the comments have been applied already.

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 605243c..736791d 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -19,18 +19,21 @@ apps:
   pactl:
     command: bin/client-wrapper usr/bin/pactl
     plugs: [client, network]
-    aliases:
-      - pactl
+    # NOTE: This is deprecated with snapd 2.25 but needs to stay to
+    # guarantee all clients are updated correctly.
+    aliases: [pactl]
   paplay:
     command: bin/client-wrapper usr/bin/paplay
     plugs: [client, home, network]
-    aliases:
-      - paplay
+    # NOTE: This is deprecated with snapd 2.25 but needs to stay to
+    # guarantee all clients are updated correctly.
+    aliases: [paplay]
   parec:
     command: bin/client-wrapper usr/bin/parec
     plugs: [client, home, network]
-    aliases:
-      - parec
+    # NOTE: This is deprecated with snapd 2.25 but needs to stay to
+    # guarantee all clients are updated correctly.
+    aliases: [parec]
   config:
     command: bin/config
 
diff --git a/tests/lib/utilities.sh b/tests/lib/utilities.sh
index aa8e52e..08c0b8c 100644
--- a/tests/lib/utilities.sh
+++ b/tests/lib/utilities.sh
@@ -22,8 +22,13 @@ install_snap_under_test() {
 		snap install --dangerous ${PROJECT_PATH}/${SNAP_NAME}_*_${SNAP_ARCH}.snap
 	fi
 	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
 }