Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:revert-manual-conn into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:snap-20

[Alfonso Sanchez-Beato]

Revert "spread: fix tests to work with epochs"

This reverts commit bd2e479614ec595050aaf4f0f63f6aec12adc095.
The change was needed so tests could run after changing the
epoch. However, this caused races as connections happen after the snap
is installed, and NM starts without all the permissions it
needs. Revert this back as now we have an epoch 1 snap already
published in 20/beta and we can install it without errors.

Revert "spread: fix tests to work with epochs"

This reverts commit bd2e479614ec595050aaf4f0f63f6aec12adc095.
The change was needed so tests could run after changing the
epoch. However, this caused races as connections happen after the snap
is installed, and NM starts without all the permissions it
needs. Revert this back as now we have an epoch 1 snap already
published in 20/beta and we can install it without errors.

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

PASSED: Continuous integration, rev:c759d6ae6420f687a445a393406af52835c30e09
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/576/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/609
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/609
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/609
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/609
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1395
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1137
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1189/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/576/rebuild

review: Approve (continuous-integration)

[Tony Espy (awe)]

LGTM

review: Approve

diff --git a/tests/lib/utilities.sh b/tests/lib/utilities.sh
index b068085..ce6ca0e 100644
--- a/tests/lib/utilities.sh
+++ b/tests/lib/utilities.sh
@@ -1,13 +1,5 @@
 #!/bin/bash
 
-snap_connect_ifaces() {
-    snap connect network-manager:firewall-control :firewall-control
-    snap connect network-manager:network :network    
-    snap connect network-manager:network-setup-observe :network-setup-observe
-    snap connect network-manager:ppp :ppp
-    snap connect network-manager:nmcli network-manager:service    
-}
-
 snap_install() {
 	name=$1
 	if [ -n "$SNAP_CHANNEL" ] ; then
@@ -16,8 +8,11 @@ snap_install() {
 			snap install --$SNAP_CHANNEL $name
 		fi
 	else
+		# Need first install from store to get all necessary assertions into
+		# place. Second local install will then bring in our locally built
+		# snap.
+		snap install $name $2
 		snap install --dangerous $PROJECT_PATH/$name*_amd64.snap
-		snap_connect_ifaces
 	fi
 }