1
diff --git a/tests/lib/prepare-all.sh b/tests/lib/prepare-all.sh
2
index 1194d1f..1c1419c 100644
3
--- a/tests/lib/prepare-all.sh
4
+++ b/tests/lib/prepare-all.sh
5
@@ -1,5 +1,17 @@
6
1
#!/bin/bash
1
#!/bin/bash
7
2
2
8
3
cat << EOF > /etc/systemd/system/load-mac80211-hwsim.service
9
4
[Unit]
10
5
Description=Load mac8022_hwsim driver
11
6
[Service]
12
7
ExecStart=/sbin/modprobe mac80211_hwsim radios=2
13
8
[Install]
14
9
WantedBy=multi-user.target
15
10
EOF
16
11
17
12
systemctl enable load-mac80211-hwsim
18
13
systemctl start load-mac80211-hwsim
19
14
20
3
# We don't have to build a snap when we should use one from a
15
# We don't have to build a snap when we should use one from a
21
4
# channel
16
# channel
22
5
if [ -n "$SNAP_CHANNEL" ] ; then
17
if [ -n "$SNAP_CHANNEL" ] ; then
23
diff --git a/tests/main/suspend-resume/task.yaml b/tests/main/suspend-resume/task.yaml
24
index 09cb2cc..2f89e25 100644
25
--- a/tests/main/suspend-resume/task.yaml
26
+++ b/tests/main/suspend-resume/task.yaml
27
@@ -1,15 +1,9 @@
28
1
summary: Verify suspend/resume tracking works reliable
1
summary: Verify suspend/resume tracking works reliable
29
2
2
30
3
restore: |
31
4
    rmmod mac80211_hwsim
32
5
33
6
execute: |
3
execute: |
34
7
    # Install necessary test-tools, we need inotify-tools in this case
4
    # Install necessary test-tools, we need inotify-tools in this case
35
8
    snap install --edge se-test-tools
5
    snap install --edge se-test-tools
36
9
6
37
10
    # Get two connected wifi network interfaces wlan0 and wlan1
38
11
    modprobe mac80211_hwsim radios=2
39
12
40
13
    # FIXME: take the one from edge for now as that is the one which
7
    # FIXME: take the one from edge for now as that is the one which
41
14
    # has automatic setup capabilities
8
    # has automatic setup capabilities
42
15
    snap install --edge wifi-ap
9
    snap install --edge wifi-ap
43
diff --git a/tests/main/wifi-connect-secured-ap/task.yaml b/tests/main/wifi-connect-secured-ap/task.yaml
44
index aa6a70c..16ebf3f 100644
45
--- a/tests/main/wifi-connect-secured-ap/task.yaml
46
+++ b/tests/main/wifi-connect-secured-ap/task.yaml
47
@@ -4,25 +4,17 @@ environment:
48
4
    WIFI_SSID: Ubuntu
4
    WIFI_SSID: Ubuntu
49
5
    WIFI_PASSPHRASE: Test1234
5
    WIFI_PASSPHRASE: Test1234
50
6
6
51
7
restore: |
52
8
    rmmod mac80211_hwsim
53
9
54
10
execute: |
7
execute: |
55
11
    # Get two connected wifi network interfaces wlan0 and wlan1 and
56
12
    # give the system soem time to settle
57
13
    modprobe mac80211_hwsim radios=2
58
14
    sleep 1
59
15
60
16
    snap install wifi-ap
8
    snap install wifi-ap
61
17
    # FIXME: until the wifi-ap utility is clever enough to retry
9
    # FIXME: until the wifi-ap utility is clever enough to retry
62
18
    # connecting with the service we need to add a short sleep here
10
    # connecting with the service we need to add a short sleep here
63
19
    sleep 0.5
11
    sleep 0.5
64
20
12
65
21
    # Setup the AP on wlan0
13
    # Setup the AP on wlan0
70
22
    /snap/bin/wifi-ap.config set wifi.interface wlan0
14
    /snap/bin/wifi-ap.config set wifi.interface=wlan0
71
23
    /snap/bin/wifi-ap.config set wifi.ssid $WIFI_SSID
15
    /snap/bin/wifi-ap.config set wifi.ssid=$WIFI_SSID
72
24
    /snap/bin/wifi-ap.config set wifi.security wpa2
16
    /snap/bin/wifi-ap.config set wifi.security=wpa2
73
25
    /snap/bin/wifi-ap.config set wifi.security-passphrase $WIFI_PASSPHRASE
17
    /snap/bin/wifi-ap.config set wifi.security-passphrase=$WIFI_PASSPHRASE
74
26
18
75
27
    # AP needs a bit to appear and be visible for NetworkManager
19
    # AP needs a bit to appear and be visible for NetworkManager
76
28
    /snap/bin/network-manager.nmcli d wifi rescan
20
    /snap/bin/network-manager.nmcli d wifi rescan
Status:	Merged
Approved by:	Alfonso Sanchez-Beato on 2017-03-22
Approved revision:	ac4408c843cae3f8ec76cfce8ee324132a8463c7
Merged at revision:	2a20a27b21eeaf78d59d7a6f1d393f99c2e3fee4
Proposed branch:	~morphis/snappy-hwe-snaps/+git/network-manager:b/fix-stable-wifi-ap-tests
Merge into:	~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:stable
Diff against target:	76 lines (+16/-18) 3 files modified tests/lib/prepare-all.sh (+12/-0) tests/main/suspend-resume/task.yaml (+0/-6) tests/main/wifi-connect-secured-ap/task.yaml (+4/-12)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
System Enablement Bot	continuous-integration		Approve on 2017-03-22
Alfonso Sanchez-Beato		2017-03-22	Approve on 2017-03-22
Review via email: mp+320601@code.launchpad.net