Checkbox

Merge lp:~sylvain-pineau/checkbox/story632_wireless_selftest_after_suspend_fix into lp:~brendan-donegan/checkbox/story632_wireless_selftest_after_suspend

  1. story632_wireless_selftest_after_suspend_fix
  2. Merge into story632_wireless_selftest...
Proposed by Sylvain Pineau
Status: Merged
Merged at revision: 1638
Proposed branch: lp:~sylvain-pineau/checkbox/story632_wireless_selftest_after_suspend_fix
Merge into: lp:~brendan-donegan/checkbox/story632_wireless_selftest_after_suspend
Diff against target: 83 lines (+12/-6)
2 files modified
jobs/suspend.txt.in (+10/-4)
jobs/wireless.txt.in (+2/-2)
To merge this branch: bzr merge lp:~sylvain-pineau/checkbox/story632_wireless_selftest_after_suspend_fix
Reviewer Review Type Date Requested Status
Brendan Donegan Pending
Review via email: mp+122633@code.launchpad.net

Description of the change

A couple of fixes for your after_suspend wireless branch

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'jobs/suspend.txt.in'
2--- jobs/suspend.txt.in 2012-09-03 16:27:21 +0000
3+++ jobs/suspend.txt.in 2012-09-04 08:53:34 +0000
4@@ -259,9 +259,11 @@
5 security and the 802.11n protocol after the system has been suspended.
6
7 plugin: shell
8-name: suspend/wireless_connection_after_suspend_after_suspend_open_n
9+name: suspend/wireless_connection_after_suspend_open_n
10 depends: suspend/suspend_advanced_auto
11-requires: device.category == 'WIRELESS'
12+requires:
13+ device.category == 'WIRELESS'
14+ environment.routers == 'multiple'
15 user: root
16 environ: OPEN_N_SSID
17 command: trap "rm -f /etc/NetworkManager/system-connections/$OPEN_N_SSID" EXIT; create_connection $OPEN_N_SSID; internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
18@@ -271,6 +273,7 @@
19
20 plugin: manual
21 name: wireless/wireless_connection_after_suspend_wpa_bg_manual
22+depends: suspend/suspend_advanced
23 requires:
24 device.category == 'WIRELESS'
25 environment.routers == 'single'
26@@ -292,11 +295,12 @@
27
28 plugin: manual
29 name: wireless/wireless_connection_after_suspend_open_bg_manual
30+depends: suspend/suspend_advanced
31 requires:
32 device.category == 'WIRELESS'
33 environment.routers == 'single'
34 user: root
35-environ: ROUTER_SSID ROUTER_PSK
36+environ: ROUTER_SSID
37 command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection $ROUTER_SSID && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
38 _description:
39 PURPOSE:
40@@ -313,6 +317,7 @@
41
42 plugin: manual
43 name: wireless/wireless_connection_after_suspend_wpa_n_manual
44+depends: suspend/suspend_advanced
45 requires:
46 device.category == 'WIRELESS'
47 environment.routers == 'single'
48@@ -334,11 +339,12 @@
49
50 plugin: manual
51 name: wireless/wireless_connection_after_suspend_open_n_manual
52+depends: suspend/suspend_advanced
53 requires:
54 device.category == 'WIRELESS'
55 environment.routers == 'single'
56 user: root
57-environ: ROUTER_SSID ROUTER_PSK
58+environ: ROUTER_SSID
59 command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection $ROUTER_SSID && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
60 _description:
61 PURPOSE:
62
63=== modified file 'jobs/wireless.txt.in'
64--- jobs/wireless.txt.in 2012-09-03 13:09:24 +0000
65+++ jobs/wireless.txt.in 2012-09-04 08:53:34 +0000
66@@ -94,7 +94,7 @@
67 device.category == 'WIRELESS'
68 environment.routers == 'single'
69 user: root
70-environ: ROUTER_SSID ROUTER_PSK
71+environ: ROUTER_SSID
72 command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection $ROUTER_SSID && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
73 _description:
74 PURPOSE:
75@@ -136,7 +136,7 @@
76 device.category == 'WIRELESS'
77 environment.routers == 'single'
78 user: root
79-environ: ROUTER_SSID ROUTER_PSK
80+environ: ROUTER_SSID
81 command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection $ROUTER_SSID && internet_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
82 _description:
83 PURPOSE:

Subscribers

People subscribed via source and target branches