Merge ~morphis/snappy-hwe-snaps/+git/wifi-ap:f/support-spread-on-hw into ~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-ap:master

[Simon Fels]

Allow running our stress test on real hardware

This is based on recent changes to tests-extras which allow us now executing all white-listed tests via something like this:

$ ./run-tests.sh \
  --spread-system=hw-ubuntu-core-16 \
  --external-address=192.168.178.36 \
  --external-user=admin \
  --external-password=admin \
  --spread-filter=tests/main/stress-ap \
  --debug

This relies on having a second WiFi network device available on the specified external system. Name of network device can be specified via the two parameters in spread.yaml

[Matteo Croce (teknoraver)]

review: Needs Fixing

71e58bc... by Simon Fels on 2017-03-06

Respect review comments

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

FAILED: Continuous integration, rev:c036235691d6e1937893979ef48681e3a7128ccf
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1175/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/223/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1086/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/907/console

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

review: Needs Fixing (continuous-integration)

[Matteo Croce (teknoraver)]

review: Needs Fixing

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

FAILED: Continuous integration, rev:2a530d35ad8fae9fd5f02edc651602df62ad4346
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1179/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/227/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1088/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/910/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:71e58bce565a4c7fcce8153358e68cec1b764410
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1181/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/229/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1092/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/911/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:71e58bce565a4c7fcce8153358e68cec1b764410
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1213/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/261/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1123/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/931/console

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

review: Needs Fixing (continuous-integration)

[Matteo Croce (teknoraver)]

review: Approve

Unmerged commits

71e58bc... by Simon Fels on 2017-03-06

Respect review comments

c036235... by Simon Fels on 2017-03-06

Add .gitignore file

1b7bc1c... by Simon Fels on 2017-03-06

Allow running our stress test on real hardware

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2aaa3a0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+parts
+stage
+prime
+
+.spread*
+.tests-extras
diff --git a/run-tests.sh b/run-tests.sh
index 0b0679d..54f23f7 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -32,12 +32,12 @@ tests-extras repository and execute the run-tests.sh script from
 there passing arguments as-is.
 
 optional arguments:
-  --help                 Show this help message and exit
-  --channel              Select another channel to build the base image from (default: stable)
-  --snap                 Extra snap to install
-  --debug                Enable verbose debugging output
-  --test-from-channel    Pull network-manager snap from the specified channel instead of building it from source
-  --force-new-image      Force generating a new image used for testing
+  --help                           Show this help message and exit
+  --channel=<channel>              Select another channel to build the base image from (default: $channel)
+  --snap=<name>                    Extra snap to install
+  --debug                          Enable verbose debugging output
+  --test-from-channel=<channel>    Pull snap from the specified channel instead of building it from source
+  --force-new-image                Force generating a new image used for testing
 EOF
 }
 
@@ -67,7 +67,7 @@ restore_and_update_tests_extras() {
 # hidden directory which is re-used since then.
 
 # Display help w/o fetching anything and exit
-[ "$1" = "--help" ] && show_help
+[ ! -d "$TESTS_EXTRAS_PATH" ] && [ "$1" = "--help" ] && show_help
 
 if [ -d "$TESTS_EXTRAS_PATH" ]; then
 	restore_and_update_tests_extras
@@ -75,5 +75,6 @@ else
 	clone_tests_extras
 fi
 
+
 echo "INFO: Executing tests runner"
 cd $TESTS_EXTRAS_PATH && ./tests-runner.sh "$@"
diff --git a/spread.yaml b/spread.yaml
index 4bea33a..9a2c2f3 100644
--- a/spread.yaml
+++ b/spread.yaml
@@ -22,6 +22,10 @@ environment:
     SNAP_NAME: wifi-ap
     # Allow the host to pass the channel to use for the test rim
     SNAP_CHANNEL: $(HOST:echo $SNAP_CHANNEL)
+    # Set these to different names when you run the tests on hardware where
+    # you need to use different interfaces.
+    HW_WLAN0_NAME: wlan0
+    HW_WLAN1_NAME: wlan1
 
 backends:
     qemu:
@@ -29,6 +33,16 @@ backends:
             - ubuntu-core-16:
                 username: test
                 password: test
+    external:
+        type: adhoc
+        environment:
+            SPREAD_EXTERNAL_ADDRESS: "$(HOST: echo ${SPREAD_EXTERNAL_ADDRESS:-localhost:8022})"
+        allocate: |
+            ADDRESS $SPREAD_EXTERNAL_ADDRESS
+        systems:
+            - hw-ubuntu-core-16:
+                username: $(HOST:echo $SPREAD_EXTERNAL_USER)
+                password: $(HOST:echo $SPREAD_EXTERNAL_PASSWORD)
 
 # Put this somewhere where we have read-write access
 path: /home/wifi-ap
@@ -39,6 +53,9 @@ exclude:
 prepare: |
   . $TESTSLIB/prepare-all.sh
 
+restore: |
+  . $TESTSLIB/restore-all.sh
+
 prepare-each: |
   # Cleanup logs so we can just dump what has happened in the debug-each
   # step below after a test case ran.
@@ -58,6 +75,7 @@ suites:
         summary: Full-system tests for the wifi-ap snap
         systems:
             - ubuntu-core-16
+            - hw-ubuntu-core-16
         prepare: |
             . $TESTSLIB/prepare.sh
         restore-each: |
diff --git a/tests/lib/prepare-all.sh b/tests/lib/prepare-all.sh
index 38380e2..49be914 100644
--- a/tests/lib/prepare-all.sh
+++ b/tests/lib/prepare-all.sh
@@ -1,7 +1,20 @@
 #!/bin/bash
 
-# Simulate two WiFi radio network interfaces
-modprobe mac80211_hwsim radios=2
+if [ "$SPREAD_SYSTEM" = "ubuntu-core-16" ]; then
+	# Simulate two WiFi radio network interfaces
+	modprobe mac80211_hwsim radios=2
+elif [ "$SPREAD_SYSTEM" = "hw-ubuntu-core-16" ]; then
+	if ! snap list | grep -q wifi-ap; then
+		echo "ERROR: wifi-ap snap is not installed. You need to manually install"
+		echo "       the version you want to test."
+		exit 1
+	fi
+	systemctl stop snap.wifi-ap.management-service
+	tar czf $SPREAD_PATH/wifi-ap-state.tar.gz /var/snap/wifi-ap/current /var/snap/wifi-ap/common
+	rm -rf /var/snap/wifi-ap/current/* /var/snap/wifi-ap/common/*
+	systemctl start snap.wifi-ap.management-service
+	exit 0
+fi
 
 # We don't have to build a snap when we should use one from a
 # channel
diff --git a/tests/lib/prepare.sh b/tests/lib/prepare.sh
index d4b7020..19e6b83 100644
--- a/tests/lib/prepare.sh
+++ b/tests/lib/prepare.sh
@@ -2,34 +2,36 @@
 
 . $TESTSLIB/utilities.sh
 
-echo "Wait for firstboot change to be ready"
-while ! snap changes | grep -q "Done"; do
-	snap changes || true
-	snap change 1 || true
-	sleep 1
-done
+if [ "$SPREAD_SYSTEM" = "ubuntu-core-16" ]; then
+	echo "Wait for firstboot change to be ready"
+	while ! snap changes | grep -q "Done"; do
+		snap changes || true
+		snap change 1 || true
+		sleep 1
+	done
 
-echo "Ensure fundamental snaps are still present"
-. $TESTSLIB/snap-names.sh
-for name in $gadget_name $kernel_name $core_name; do
-	if ! snap list | grep -q $name ; then
-		echo "Not all fundamental snaps are available, all-snap image not valid"
-		echo "Currently installed snaps:"
-		snap list
-		exit 1
-	fi
-done
+	echo "Ensure fundamental snaps are still present"
+	. $TESTSLIB/snap-names.sh
+	for name in $gadget_name $kernel_name $core_name; do
+		if ! snap list | grep -q $name ; then
+			echo "Not all fundamental snaps are available, all-snap image not valid"
+			echo "Currently installed snaps:"
+			snap list
+			exit 1
+		fi
+	done
 
-echo "Kernel has a store revision"
-snap list | grep ^${kernel_name} | grep -E " [0-9]+\s+canonical"
+	echo "Kernel has a store revision"
+	snap list | grep ^${kernel_name} | grep -E " [0-9]+\s+canonical"
 
-install_snap_under_test
+	install_snap_under_test
 
-# Snapshot of the current snapd state for a later restore
-if [ ! -f $SPREAD_PATH/snapd-state.tar.gz ] ; then
-	systemctl stop snapd.service snapd.socket
-	tar czf $SPREAD_PATH/snapd-state.tar.gz /var/lib/snapd /etc/netplan
-	systemctl start snapd.socket
+	# Snapshot of the current snapd state for a later restore
+	if [ ! -f $SPREAD_PATH/snapd-state.tar.gz ] ; then
+		systemctl stop snapd.service snapd.socket
+		tar czf $SPREAD_PATH/snapd-state.tar.gz /var/lib/snapd /etc/netplan
+		systemctl start snapd.socket
+	fi
 fi
 
 # For debugging dump all snaps and connected slots/plugs
diff --git a/tests/lib/restore-all.sh b/tests/lib/restore-all.sh
new file mode 100644
index 0000000..5c371ef
--- /dev/null
+++ b/tests/lib/restore-all.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ "$SPREAD_SYSTEM" = "hw-ubuntu-core-16" ]; then
+    if [ -e $SPREAD_PATH/wifi-ap-state.tar.gz ]; then
+        systemctl stop snap.wifi-ap.management-service || true
+        tar xzf $SPREAD_PATH/wifi-ap-state.tar.gz -C /
+        systemctl start snap.wifi-ap.management-service
+    fi
+fi
diff --git a/tests/lib/restore-each.sh b/tests/lib/restore-each.sh
index fa474b4..324b4d6 100644
--- a/tests/lib/restore-each.sh
+++ b/tests/lib/restore-each.sh
@@ -3,6 +3,13 @@
 . $TESTSLIB/snap-names.sh
 . $TESTSLIB/utilities.sh
 
+if [ "$SPREAD_SYSTEM" = "hw-ubuntu-core-16" ]; then
+	systemctl stop snap.wifi-ap.management-service || true
+	rm -rf /var/snap/wifi-ap/current/* /var/snap/wifi-ap/common/*
+	systemctl start snap.wifi-ap.management-service
+	exit 0
+fi
+
 # Remove all snaps not being the core, gadget, kernel or snap we're testing
 for snap in /snap/*; do
 	snap="${snap:6}"
diff --git a/tests/main/background-process-control/task.yaml b/tests/main/background-process-control/task.yaml
index 58dd047..070aadf 100644
--- a/tests/main/background-process-control/task.yaml
+++ b/tests/main/background-process-control/task.yaml
@@ -1,5 +1,8 @@
 summary: Test correct service behavior to ensure the background AP process is running
 
+systems:
+    - -hw-ubuntu-core-16
+
 prepare: |
     # We need some tools for scanning etc.
     snap install wireless-tools
@@ -24,7 +27,7 @@ execute: |
 
     # Restart should get us back into the same state we were in before
     /snap/bin/wifi-ap.status restart-ap
-    # Restart needs some time 
+    # Restart needs some time
     sleep 5
     /snap/bin/wifi-ap.status | grep "ap.active: true"
     /snap/bin/wireless-tools.iw dev wlan1 scan | grep 'SSID: Ubuntu'
diff --git a/tests/main/conf-wizard-auto-at-boot/task.yaml b/tests/main/conf-wizard-auto-at-boot/task.yaml
index b042097..01d8ddb 100644
--- a/tests/main/conf-wizard-auto-at-boot/task.yaml
+++ b/tests/main/conf-wizard-auto-at-boot/task.yaml
@@ -1,5 +1,8 @@
 summary: Verify that the automatic wizard works
 
+systems:
+    - -hw-ubuntu-core-16
+
 execute: |
     # Check that we get good default values
     test "$(/snap/bin/wifi-ap.config get disabled)" = false
diff --git a/tests/main/conf-wizard-auto-can-be-blocked/task.yaml b/tests/main/conf-wizard-auto-can-be-blocked/task.yaml
index ecacd6f..4f921a0 100644
--- a/tests/main/conf-wizard-auto-can-be-blocked/task.yaml
+++ b/tests/main/conf-wizard-auto-can-be-blocked/task.yaml
@@ -1,5 +1,8 @@
 summary: Verify the automatic wizard running on service startup can be blocked with a configuration option
 
+systems:
+    - -hw-ubuntu-core-16
+
 environment:
     SNAP_COMMON: /var/snap/wifi-ap/common
     SNAP_DATA: /var/snap/wifi-ap/current
diff --git a/tests/main/conf-wizard-auto-nodefaultip/task.yaml b/tests/main/conf-wizard-auto-nodefaultip/task.yaml
index 8be2f75..81c168c 100644
--- a/tests/main/conf-wizard-auto-nodefaultip/task.yaml
+++ b/tests/main/conf-wizard-auto-nodefaultip/task.yaml
@@ -1,5 +1,8 @@
 summary: Verify that the wizard is able to find an unused IP
 
+systems:
+    - -hw-ubuntu-core-16
+
 prepare: |
     # Dummy interface to assign an IP to
     modprobe dummy
diff --git a/tests/main/conf-wizard-auto-noip/task.yaml b/tests/main/conf-wizard-auto-noip/task.yaml
index 10822e1..e557c19 100644
--- a/tests/main/conf-wizard-auto-noip/task.yaml
+++ b/tests/main/conf-wizard-auto-noip/task.yaml
@@ -1,5 +1,8 @@
 summary: Verify that wizard fails when all private subnets are busy
 
+systems:
+    - -hw-ubuntu-core-16
+
 prepare: |
     # Dummy interface to assign an IP to
     modprobe dummy
diff --git a/tests/main/conf-wizard-auto-nowifi/task.yaml b/tests/main/conf-wizard-auto-nowifi/task.yaml
index ce89798..71e0190 100644
--- a/tests/main/conf-wizard-auto-nowifi/task.yaml
+++ b/tests/main/conf-wizard-auto-nowifi/task.yaml
@@ -1,5 +1,8 @@
 summary: Verify that wizard fails when there are no WiFi devices
 
+systems:
+    - -hw-ubuntu-core-16
+
 prepare: |
     rmmod mac80211_hwsim
 
diff --git a/tests/main/conf-wizard-auto/task.yaml b/tests/main/conf-wizard-auto/task.yaml
index ae6219c..0b1f8cf 100644
--- a/tests/main/conf-wizard-auto/task.yaml
+++ b/tests/main/conf-wizard-auto/task.yaml
@@ -1,5 +1,8 @@
 summary: Verify that the automatic wizard works
 
+systems:
+    - -hw-ubuntu-core-16
+
 execute: |
     # The automatic wizard was already started
 
diff --git a/tests/main/conf-wizard-disabled-from-gadget/task.yaml b/tests/main/conf-wizard-disabled-from-gadget/task.yaml
index 227ecfb..caf7f84 100644
--- a/tests/main/conf-wizard-disabled-from-gadget/task.yaml
+++ b/tests/main/conf-wizard-disabled-from-gadget/task.yaml
@@ -1,5 +1,8 @@
 summary: Verify the wizard can be disabled by default from a gadget snap
 
+systems:
+    - -hw-ubuntu-core-16
+
 # FIXME: This test needs to stay manual until a snap is in edge which
 # contains a configure hook. Otherwise the snap installation will
 # always fail.
diff --git a/tests/main/configuration-changes/task.yaml b/tests/main/configuration-changes/task.yaml
index 1800102..056580e 100644
--- a/tests/main/configuration-changes/task.yaml
+++ b/tests/main/configuration-changes/task.yaml
@@ -1,5 +1,8 @@
 summary: Test that we can change the configuration
 
+systems:
+    - -hw-ubuntu-core-16
+
 execute: |
     test "`/snap/bin/wifi-ap.config get wifi.interface`" = wlan0
     /snap/bin/wifi-ap.config set wifi.interface=wlan1
diff --git a/tests/main/default-conf-brings-up-ap/task.yaml b/tests/main/default-conf-brings-up-ap/task.yaml
index 6777c8d..b57850e 100644
--- a/tests/main/default-conf-brings-up-ap/task.yaml
+++ b/tests/main/default-conf-brings-up-ap/task.yaml
@@ -1,5 +1,8 @@
 summary: Verify that the default configuration is able to spawn up an AP
 
+systems:
+    - -hw-ubuntu-core-16
+
 execute: |
     . $TESTSLIB/utilities.sh
 
diff --git a/tests/main/default-configuration/tasks.yaml b/tests/main/default-configuration/tasks.yaml
index d6c1cba..67f9cb4 100644
--- a/tests/main/default-configuration/tasks.yaml
+++ b/tests/main/default-configuration/tasks.yaml
@@ -1,5 +1,8 @@
 summary: Verify snap has correct default configuration
 
+systems:
+    - -hw-ubuntu-core-16
+
 execute: |
     test `/snap/bin/wifi-ap.config get debug` = false
     test `/snap/bin/wifi-ap.config get disabled` = true
diff --git a/tests/main/documentation-builds/task.yaml b/tests/main/documentation-builds/task.yaml
index e746465..8780a98 100644
--- a/tests/main/documentation-builds/task.yaml
+++ b/tests/main/documentation-builds/task.yaml
@@ -1,5 +1,11 @@
 summary: Verify the project documentation is building without errors
 
+systems:
+    - -hw-ubuntu-core-16
+
+systems:
+    - -hw-ubuntu-core-16
+
 execute: |
     # Need to install in devmode as otherwise the snap can't access our project
     # home which is outside of the home directory of our current user.
diff --git a/tests/main/socket-plug/task.yaml b/tests/main/socket-plug/task.yaml
index 8306aaf..e18d0db 100644
--- a/tests/main/socket-plug/task.yaml
+++ b/tests/main/socket-plug/task.yaml
@@ -1,5 +1,8 @@
 summary: Verify that the exported content interface does work
 
+systems:
+    - -hw-ubuntu-core-16
+
 execute: |
     # The automatic wizard was already started
 
diff --git a/tests/main/stress-ap-status-control/task.yaml b/tests/main/stress-ap-status-control/task.yaml
deleted file mode 100644
index 89ded92..0000000
--- a/tests/main/stress-ap-status-control/task.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-summary: Stress test for the AP status control API
-
-environment:
-    RESTART_ITERATIONS: 15
-    SCAN_ITERATIONS: 10
-
-prepare: |
-    # We need some tools for scanning etc.
-    snap install wireless-tools
-    snap connect wireless-tools:network-control core
-
-execute: |
-    # Bring up the access point first
-    /snap/bin/wifi-ap.config set disabled=false
-    until /snap/bin/wifi-ap.status | grep "ap.active: true" ; do
-        sleep 0.5
-    done
-
-    # Scan for networks on the other side of the WiFi network
-    # and ensure the network is available.
-    ifconfig wlan1 up
-    n=0
-    found_ap=0
-    while [ $n -lt $SCAN_ITERATIONS ] ; do
-        if /snap/bin/wireless-tools.iw dev wlan1 scan | grep 'SSID: Ubuntu'; then
-            found_ap=1
-            break
-        fi
-        sleep 0.5
-        let n=n+1
-    done
-    test $found_ap -eq 1
-
-    # We will restart the AP a huge number of times again and again
-    # and expect that the AP afterwards comes back up normally and
-    # we can still search and connect to it.
-    n=0
-    while [ $n -lt $RESTART_ITERATIONS ] ; do
-        /snap/bin/wifi-ap.status restart-ap
-        sleep 0.5
-        let n=n+1
-    done
-
-    # Wait for AP to be marked as active again
-    until /snap/bin/wifi-ap.status | fgrep "ap.active: true" ; do
-        sleep 0.5
-    done
-
-    # The AP should be still available in our scan result
-    n=0
-    found_ap=0
-    while [ $n -lt $SCAN_ITERATIONS ] ; do
-        if /snap/bin/wireless-tools.iw dev wlan1 scan | grep 'SSID: Ubuntu'; then
-            found_ap=1
-            break
-        fi
-        sleep 0.5
-        let n=n+1
-    done
-    test $found_ap -eq 1
-
-    # Verify we can associate with the AP
-    sudo /snap/bin/wireless-tools.iw wlan1 connect Ubuntu
-    sudo /snap/bin/wireless-tools.iw dev wlan1 link | grep 'SSID: Ubuntu'
-
-    # We should only have one hostapd and one dnsmasq process at this time
-    # (we have to ignore the grep'ing process as otherwise we get a count of 2)
-    test `pgrep -c hostapd` -eq 1
-    test `pgrep -c dnsmasq` -eq 1
diff --git a/tests/main/stress-ap/task.yaml b/tests/main/stress-ap/task.yaml
new file mode 100644
index 0000000..4b667b8
--- /dev/null
+++ b/tests/main/stress-ap/task.yaml
@@ -0,0 +1,88 @@
+summary: Stress test for the WiFi AP
+
+environment:
+    RESTART_ITERATIONS: 30
+    SCAN_ITERATIONS: 15
+    AP_NAME: "StressUbuntuAP"
+
+prepare: |
+    # We need some tools for scanning etc.
+    snap install wireless-tools
+    snap connect wireless-tools:network-control core
+
+execute: |
+    # Bring up the access point first
+    /snap/bin/wifi-ap.config set \
+        wifi.interface=$HW_WLAN0_NAME \
+        wifi.ssid=$AP_NAME \
+        disabled=false
+
+    until /snap/bin/wifi-ap.status | grep "ap.active: true" ; do
+        sleep 0.5
+    done
+
+    scan_command() {
+        if [ -e /snap/bin/nmcli ]; then
+            /snap/bin/nmcli d wifi rescan
+            /snap/bin/nmcli d wifi list ifname $1
+            return
+        fi
+        /snap/bin/wireless-tools.iw dev $1 scan
+    }
+
+    # Scan for networks on the other side of the WiFi network
+    # and ensure the network is available.
+    ifconfig $HW_WLAN1_NAME up
+    n=0
+    found_ap=0
+    while [ $n -lt $SCAN_ITERATIONS ] ; do
+        if scan_command $HW_WLAN1_NAME | grep $AP_NAME; then
+            found_ap=1
+            break
+        fi
+        sleep 0.5
+        let n=n+1
+    done
+    test $found_ap -eq 1
+
+    # We will restart the AP a huge number of times again and again
+    # and expect that the AP afterwards comes back up normally and
+    # we can still search and connect to it.
+    n=0
+    while [ $n -lt $RESTART_ITERATIONS ] ; do
+        /snap/bin/wifi-ap.status restart-ap
+        sleep 0.5
+        let n=n+1
+    done
+
+    # Wait for AP to be marked as active again
+    until /snap/bin/wifi-ap.status | fgrep "ap.active: true" ; do
+        sleep 0.5
+    done
+
+    # The AP should be still available in our scan result
+    n=0
+    found_ap=0
+    while [ $n -lt $SCAN_ITERATIONS ] ; do
+        if scan_command $HW_WLAN1_NAME | grep $AP_NAME; then
+            found_ap=1
+            break
+        fi
+        sleep 0.5
+        let n=n+1
+    done
+    test $found_ap -eq 1
+
+    if [ -e /snap/bin/nmcli ]; then
+        /snap/bin/nmcli d wifi connect $AP_NAME ifname $HW_WLAN1_NAME
+        /snap/bin/nmcli d | grep "$HW_WLAN1_NAME.*connected"
+    else
+        # Verify we can associate with the AP
+        sudo /snap/bin/wireless-tools.iw $HW_WLAN1_NAME connect $AP_NAME
+        sudo /snap/bin/wireless-tools.iw dev $HW_WLAN1_NAME link | grep $AP_NAME
+    fi
+
+    # We should only have one hostapd and one dnsmasq process at this time
+    # (we have to ignore the grep'ing process as otherwise we get a count of 2)
+    test `pgrep -c hostapd` -eq 1
+    test `pgrep -c dnsmasq` -eq 1
diff --git a/tests/main/utf8-ssid/task.yaml b/tests/main/utf8-ssid/task.yaml
index 9b6faa6..1c2759d 100644
--- a/tests/main/utf8-ssid/task.yaml
+++ b/tests/main/utf8-ssid/task.yaml
@@ -1,5 +1,8 @@
 summary: Verify that the AP can accept an UTF8 SSID
 
+systems:
+    - -hw-ubuntu-core-16
+
 environment:
     SCAN_ITERATIONS: 15
 
@@ -45,4 +48,3 @@ execute: |
     # Verify we can associate with the AP
     /snap/bin/wireless-tools.iw wlan1 connect 'Ubuntu👍'
     /snap/bin/wireless-tools.iw dev wlan1 link | fgrep 'SSID: Ubuntu\xf0\x9f\x91\x8d'
-