Merge ~morphis/snappy-hwe-snaps/+git/network-manager:suspend-resume into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master

[Simon Fels]

Enable suspend/resume tracking via systemd

 * add spread test to test suspend/resume tracking probably
 * disable session tracking explicitly as not support currently
 * always unload the mac80211_hwsim driver when we used it

[Konrad Zapałowicz (kzapalowicz)]

Ack

review: Approve (code)

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

FAILED: Continuous integration, rev:a8bbd0f8979451850ebea869912587ad09df7071
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/526/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/266/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/434/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:a8bbd0f8979451850ebea869912587ad09df7071
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/527/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/267/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/435/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:a8bbd0f8979451850ebea869912587ad09df7071
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/528/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/268
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/436/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:915a8e10a66e9232352b73186650eb88e951dc7b
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/529/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/269
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/437/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:915a8e10a66e9232352b73186650eb88e951dc7b
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/530/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/270
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/438/console

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

review: Approve (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

diff --git a/run-tests.sh b/run-tests.sh
index eaa2fca..0c8a1fc 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -17,7 +17,7 @@
 set -e
 
 image_name=ubuntu-core-16.img
-channel=candidate
+channel=stable
 spread_opts=
 force_new_image=0
 test_from_channel=0
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 56ba3f0..f1c9e00 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -135,6 +135,10 @@ parts:
       - --with-dhclient=no
       - --with-dnsmasq=no
       - --with-systemd-journal=no
+      - --with-session-tracking=no
+      # We only support suspend/resume tracking together with systemd/logind
+      # at the moment.
+      - --with-suspend-resume=systemd
       # Removes dependency on libicudata which weights 25M. Also libsoup
       # is only used to verify a domain in the DNS resolve process has a
       # valid format and to check if a valid internet connection is available.
diff --git a/tests/main/suspend-resume/task.yaml b/tests/main/suspend-resume/task.yaml
new file mode 100644
index 0000000..b5df7d1
--- /dev/null
+++ b/tests/main/suspend-resume/task.yaml
@@ -0,0 +1,80 @@
+summary: Verify suspend/resume tracking works reliable
+
+restore: |
+    rmmod mac80211_hwsim
+
+execute: |
+    # Install necessary test-tools, we need inotify-tools in this case
+    snap install --edge se-test-tools
+
+    # Get two connected wifi network interfaces wlan0 and wlan1
+    modprobe mac80211_hwsim radios=2
+
+    # FIXME: take the one from edge for now as that is the one which
+    # has automatic setup capabilities
+    snap install --edge wifi-ap
+
+    /snap/bin/network-manager.nmcli d wifi rescan
+    while ! /snap/bin/network-manager.nmcli d wifi | grep Ubuntu ; do
+        /snap/bin/network-manager.nmcli d wifi rescan
+        sleep 1
+    done
+
+    /snap/bin/network-manager.nmcli d wifi connect Ubuntu
+
+    # Override the existing systemd-suspend service unit with a customized
+    # one to prevent the device from entering real suspend. The service unit
+    # will block as long as no new files gets created inside the specified
+    # directory inotifywait listens for changes on.
+    cat <<-EOF > $PROJECT_PATH/systemd-suspend.service
+    [Unit]
+    Description=Suspend
+    Documentation=man:systemd-suspend.service(8)
+    DefaultDependencies=no
+    [Service]
+    Type=oneshot
+    ExecStart=/bin/sh -c '/snap/bin/se-test-tools.inotifywait -e create /home/network-manager/systemd-suspend'
+    EOF
+    mkdir -p /home/network-manager/systemd-suspend
+    mount -o bind,ro $PROJECT_PATH/systemd-suspend.service /lib/systemd/system/systemd-suspend.service
+    systemctl daemon-reload
+
+    # NetworkManager should have an inhibit lock in place by default
+    systemd-inhibit --list | grep "NetworkManager needs to turn off networks"
+
+    service=snap.network-manager.networkmanager
+
+    # Flush the syslog so that we can reliable grep it once we triggered
+    # the system suspend
+    journalctl --flush -u $service
+
+    # Kick off the actual suspend in background so that we can continue
+    # verifying the correct state left by the system before it would
+    # normally enter a sleep state.
+    systemctl suspend --no-block &
+
+    # The easiest way to ensure NetworkManager did the right thing is
+    # by going through its log output and verifying it prints out
+    # what we expect.
+    journalctl --no-pager -u $service | grep 'manager: sleep requested'
+    journalctl --no-pager -u $service | grep 'manager: sleeping...'
+    journalctl --no-pager -u $service | grep "device (wlan1): state change: activated -> unmanaged (reason 'sleeping')"
+    journalctl --no-pager -u $service | grep 'manager: NetworkManager state is now ASLEEP'
+
+    # Connection should be reported as disconnected
+    /snap/bin/network-manager.nmcli d | grep -v 'wlan1.*connected'
+    # .. and interface should be disabled
+    ifconfig | grep -v wlan1
+
+    # Now we wakeup the system again and verify NetworkManager
+    # is correctly setting up the ethernet port again.
+    journalctl --flush -u $service
+    touch $PROJECT_PATH/systemd-suspend/wakeup
+
+    journalctl --no-pager -u $service | grep 'manager: wake requested (sleeping: yes  enabled: yes)'
+    journalctl --no-pager -u $service | grep 'manager: NetworkManager state is now CONNECTED_LOCAL'
+    journalctl --no-pager -u $service | grep 'manager: NetworkManager state is now CONNECTED_GLOBAL'
+    journalctl --no-pager -u $service | grep 'device (wlan1): Activation: successful, device activated.'
+
+    ifconfig | grep wlan1
+    /snap/bin/network-manager.nmcli d | grep -v 'wlan1.*connected'
diff --git a/tests/main/wifi-connect-secured-ap/task.yaml b/tests/main/wifi-connect-secured-ap/task.yaml
index ed56a9b..2c7ed53 100644
--- a/tests/main/wifi-connect-secured-ap/task.yaml
+++ b/tests/main/wifi-connect-secured-ap/task.yaml
@@ -4,6 +4,9 @@ environment:
     WIFI_SSID: Ubuntu
     WIFI_PASSPHRASE: Test1234
 
+restore: |
+    rmmod mac80211_hwsim
+
 execute: |
     snap install wifi-ap