1
diff --git a/run-tests.sh b/run-tests.sh
2
index eaa2fca..0c8a1fc 100755
3
--- a/run-tests.sh
4
+++ b/run-tests.sh
5
@@ -17,7 +17,7 @@
6
17
set -e
17
set -e
7
18
18
8
19
image_name=ubuntu-core-16.img
19
image_name=ubuntu-core-16.img
10
20
channel=candidate
20
channel=stable
11
21
spread_opts=
21
spread_opts=
12
22
force_new_image=0
22
force_new_image=0
13
23
test_from_channel=0
23
test_from_channel=0
14
diff --git a/snapcraft.yaml b/snapcraft.yaml
15
index 56ba3f0..f1c9e00 100644
16
--- a/snapcraft.yaml
17
+++ b/snapcraft.yaml
18
@@ -135,6 +135,10 @@ parts:
19
135
      - --with-dhclient=no
135
      - --with-dhclient=no
20
136
      - --with-dnsmasq=no
136
      - --with-dnsmasq=no
21
137
      - --with-systemd-journal=no
137
      - --with-systemd-journal=no
22
138
      - --with-session-tracking=no
23
139
      # We only support suspend/resume tracking together with systemd/logind
24
140
      # at the moment.
25
141
      - --with-suspend-resume=systemd
26
138
      # Removes dependency on libicudata which weights 25M. Also libsoup
142
      # Removes dependency on libicudata which weights 25M. Also libsoup
27
139
      # is only used to verify a domain in the DNS resolve process has a
143
      # is only used to verify a domain in the DNS resolve process has a
28
140
      # valid format and to check if a valid internet connection is available.
144
      # valid format and to check if a valid internet connection is available.
29
diff --git a/tests/main/suspend-resume/task.yaml b/tests/main/suspend-resume/task.yaml
30
141
new file mode 100644
145
new file mode 100644
31
index 0000000..b5df7d1
32
--- /dev/null
33
+++ b/tests/main/suspend-resume/task.yaml
34
@@ -0,0 +1,80 @@
35
1
summary: Verify suspend/resume tracking works reliable
36
2
37
3
restore: |
38
4
    rmmod mac80211_hwsim
39
5
40
6
execute: |
41
7
    # Install necessary test-tools, we need inotify-tools in this case
42
8
    snap install --edge se-test-tools
43
9
44
10
    # Get two connected wifi network interfaces wlan0 and wlan1
45
11
    modprobe mac80211_hwsim radios=2
46
12
47
13
    # FIXME: take the one from edge for now as that is the one which
48
14
    # has automatic setup capabilities
49
15
    snap install --edge wifi-ap
50
16
51
17
    /snap/bin/network-manager.nmcli d wifi rescan
52
18
    while ! /snap/bin/network-manager.nmcli d wifi | grep Ubuntu ; do
53
19
        /snap/bin/network-manager.nmcli d wifi rescan
54
20
        sleep 1
55
21
    done
56
22
57
23
    /snap/bin/network-manager.nmcli d wifi connect Ubuntu
58
24
59
25
    # Override the existing systemd-suspend service unit with a customized
60
26
    # one to prevent the device from entering real suspend. The service unit
61
27
    # will block as long as no new files gets created inside the specified
62
28
    # directory inotifywait listens for changes on.
63
29
    cat <<-EOF > $PROJECT_PATH/systemd-suspend.service
64
30
    [Unit]
65
31
    Description=Suspend
66
32
    Documentation=man:systemd-suspend.service(8)
67
33
    DefaultDependencies=no
68
34
    [Service]
69
35
    Type=oneshot
70
36
    ExecStart=/bin/sh -c '/snap/bin/se-test-tools.inotifywait -e create /home/network-manager/systemd-suspend'
71
37
    EOF
72
38
    mkdir -p /home/network-manager/systemd-suspend
73
39
    mount -o bind,ro $PROJECT_PATH/systemd-suspend.service /lib/systemd/system/systemd-suspend.service
74
40
    systemctl daemon-reload
75
41
76
42
    # NetworkManager should have an inhibit lock in place by default
77
43
    systemd-inhibit --list | grep "NetworkManager needs to turn off networks"
78
44
79
45
    service=snap.network-manager.networkmanager
80
46
81
47
    # Flush the syslog so that we can reliable grep it once we triggered
82
48
    # the system suspend
83
49
    journalctl --flush -u $service
84
50
85
51
    # Kick off the actual suspend in background so that we can continue
86
52
    # verifying the correct state left by the system before it would
87
53
    # normally enter a sleep state.
88
54
    systemctl suspend --no-block &
89
55
90
56
    # The easiest way to ensure NetworkManager did the right thing is
91
57
    # by going through its log output and verifying it prints out
92
58
    # what we expect.
93
59
    journalctl --no-pager -u $service | grep 'manager: sleep requested'
94
60
    journalctl --no-pager -u $service | grep 'manager: sleeping...'
95
61
    journalctl --no-pager -u $service | grep "device (wlan1): state change: activated -> unmanaged (reason 'sleeping')"
96
62
    journalctl --no-pager -u $service | grep 'manager: NetworkManager state is now ASLEEP'
97
63
98
64
    # Connection should be reported as disconnected
99
65
    /snap/bin/network-manager.nmcli d | grep -v 'wlan1.*connected'
100
66
    # .. and interface should be disabled
101
67
    ifconfig | grep -v wlan1
102
68
103
69
    # Now we wakeup the system again and verify NetworkManager
104
70
    # is correctly setting up the ethernet port again.
105
71
    journalctl --flush -u $service
106
72
    touch $PROJECT_PATH/systemd-suspend/wakeup
107
73
108
74
    journalctl --no-pager -u $service | grep 'manager: wake requested (sleeping: yes  enabled: yes)'
109
75
    journalctl --no-pager -u $service | grep 'manager: NetworkManager state is now CONNECTED_LOCAL'
110
76
    journalctl --no-pager -u $service | grep 'manager: NetworkManager state is now CONNECTED_GLOBAL'
111
77
    journalctl --no-pager -u $service | grep 'device (wlan1): Activation: successful, device activated.'
112
78
113
79
    ifconfig | grep wlan1
114
80
    /snap/bin/network-manager.nmcli d | grep -v 'wlan1.*connected'
115
diff --git a/tests/main/wifi-connect-secured-ap/task.yaml b/tests/main/wifi-connect-secured-ap/task.yaml
116
index ed56a9b..2c7ed53 100644
117
--- a/tests/main/wifi-connect-secured-ap/task.yaml
118
+++ b/tests/main/wifi-connect-secured-ap/task.yaml
119
@@ -4,6 +4,9 @@ environment:
120
4
    WIFI_SSID: Ubuntu
4
    WIFI_SSID: Ubuntu
121
5
    WIFI_PASSPHRASE: Test1234
5
    WIFI_PASSPHRASE: Test1234
122
6
6
123
7
restore: |
124
8
    rmmod mac80211_hwsim
125
9
126
7
execute: |
10
execute: |
127
8
    snap install wifi-ap
11
    snap install wifi-ap
128
9
12
Status:	Merged
Approved by:	Alfonso Sanchez-Beato on 2016-12-22
Approved revision:	915a8e10a66e9232352b73186650eb88e951dc7b
Merged at revision:	57b73020ce529d4b8f4250bb1487dbc85873aece
Proposed branch:	~morphis/snappy-hwe-snaps/+git/network-manager:suspend-resume
Merge into:	~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master
Diff against target:	127 lines (+88/-1) 4 files modified run-tests.sh (+1/-1) snapcraft.yaml (+4/-0) tests/main/suspend-resume/task.yaml (+80/-0) tests/main/wifi-connect-secured-ap/task.yaml (+3/-0)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Alfonso Sanchez-Beato		2016-12-21	Approve on 2016-12-21
System Enablement Bot	continuous-integration		Approve on 2016-12-21
Konrad Zapałowicz (community)	code	2016-12-21	Approve on 2016-12-21
Tony Espy		2016-12-21	Pending
Review via email: mp+313683@code.launchpad.net