Merge ~morphis/snappy-hwe-snaps/+git/network-manager:f/powercycle-wifi-for-each-test into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master

[Simon Fels]

Powercycle WiFi interfaces before each test run

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

See below

review: Needs Fixing

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

FAILED: Continuous integration, rev:0a672c4d85b53b5c86b7c3f79b76b1211c0397e5
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1378/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/657/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1286/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1289/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/307/console

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

review: Needs Fixing (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

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

FAILED: Continuous integration, rev:2c047bfc8bdf125f5f95612a84120935c68d439c
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1380/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/659/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1287/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1291/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/308

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

review: Needs Fixing (continuous-integration)

[Jim Hodapp (jhodapp)]

One minor change.

review: Needs Fixing

Unmerged commits

2c047bf... by Simon Fels on 2017-03-22

Powercycle WiFi interfaces before each test run

This will ensure that the interfaces we have around for our test
cases are correctly reset and don't have any scan results pending
which could lead to problems with follow up test cases.

diff --git a/spread.yaml b/spread.yaml
index 83abb24..0a88734 100644
--- a/spread.yaml
+++ b/spread.yaml
@@ -76,6 +76,8 @@ suites:
             switch_netplan_to_network_manager
             . $TESTSLIB/prepare.sh
             REBOOT
+        prepare-each: |
+            . $TESTSLIB/prepare-each.h
         restore-each: |
             . $TESTSLIB/restore-each.sh
         restore: |
diff --git a/tests/lib/prepare-each.sh b/tests/lib/prepare-each.sh
new file mode 100644
index 0000000..116707e
--- /dev/null
+++ b/tests/lib/prepare-each.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+. $TESTSLIB/utilities.sh
+
+# Powercycle both interface to get them back into a sane state before
+# we install the wifi-ap snap
+snap install --devmode wireless-tools
+for d in wlan0 wlan1 ; do
+    phy=$(iw dev $d info | awk '/wiphy/{print $2}')
+    /snap/bin/wireless-tools.rfkill block $phy
+    /snap/bin/wireless-tools.rfkill unblock $phy
+done
+snap remove wireless-tools