Merge lp:~brendan-donegan/checkbox/bug861502_reconnect_wireless into lp:checkbox

[Brendan Donegan]

The wireless before/after suspend tests used to save just the name of the interface which was connected before the test ran. This proved sufficient in most cases, but didn't truly reflect the connections that were actually in place before the test. This was a problem in some situations - so this change updates the job command to store the connections using 'nmcli con status' and then restore them using 'nmcli con up'

The reconnect script has also been removed as I felt that the code to do the reconnect was terse enough not to require a separate script.

[Ara Pulido (ara)]

Instead of saving just the SSID name, nmcli saves "Auto <SSID>", so this fix fails for me:

ara@sushirider:~/curro/checkbox/checkbox/trunk/scripts$ nmcli -t -f NAME con status > $CHECKBOX_DATA/connections && ./connect_wireless && ./internet_test --interface=`nmcli dev list | grep -B 1 wireless | grep GENERAL.DEVICE | awk '{print $2}'` && while read CON; do nmcli con up "$CON"; done < $CHECKBOX_DATA/connections
Error: Device 'eth0' (/org/freedesktop/NetworkManager/Devices/0) disconnecting failed: This device is not active
Device state: 30 (disconnected)
Active connection state: activating
Active connection path: /org/freedesktop/NetworkManager/ActiveConnection/6
state: activated
Connection activated
Internet connection fully established
Unknown parameter: Auto Musireta
Error: id or uuid has to be specified.

review: Needs Fixing

[Ara Pulido (ara)]

A more reliable way to do it.

To save the UUID of the connection:

$ nmcli -f UUID con status

To then reconnect to that connection:

nmcli con up uuid $CON

[Brendan Donegan (brendan-donegan)]

I'm sure I tested this exact command and it worked, but looking at it now I see I left out the 'id' keyword from the 'nmcli con up' call.

Note that to better understand what is going on here you should know that the name of the *connection* not the SSID of the router is being saved. These are often similar or identical - but nmcli con up needs the connection name itself to work properly.

review: Needs Resubmitting

[lp:~brendan-donegan/checkbox/bug861502_reconnect_wireless]

1083. By Brendan Donegan on 2011-09-29

Left out id from nmcli con up.

1084. By Brendan Donegan on 2011-09-29

Using UUID instead of name to ensure they are the same connection.

1085. By Brendan Donegan on 2011-09-29

vim typo

[Brendan Donegan (brendan-donegan)]

Sticky keys introduced an extra 'i' on line 30 thanks to vim :(

review: Needs Resubmitting

[Ara Pulido (ara)]

Looks good, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-29 06:58:55 +0000
+++ debian/changelog	2011-09-29 09:18:23 +0000
@@ -9,6 +9,7 @@
   * Remove storage_devices_test from Ubuntu Friendly whitelist since bonnie++  (which it uses) is not installed by default (LP: #855841)
   * Changed description and name to reflect Ubuntu Friendly branding. Now when a user searches for Ubuntu Friendly in the lens, Checkbox will appear (LP: #852036)
   * Reset the selections at the test suite prompt if No is selected at the recover prompt (LP: #861208)
+  * Save the connection name(s) instead of the interface name so that they can be reconnected to properly after the wireless before/after suspend tests have completed (LP: #861502)
 
   [Daniel Manrique]
   * Restored _recover attribute, re-enabling welcome and test selection

=== modified file 'jobs/suspend.txt.in'
--- jobs/suspend.txt.in	2011-09-22 16:26:54 +0000
+++ jobs/suspend.txt.in	2011-09-29 09:18:23 +0000
@@ -30,7 +30,7 @@
 plugin: shell
 name: suspend/wireless_before_suspend
 depends: networking/wireless_connection
-command: nmcli -t -f DEVICES con status > $CHECKBOX_DATA/iface && connect_wireless && internet_test --interface=`nmcli dev list | grep -B 1 wireless | grep GENERAL.DEVICE | awk '{print $2}'` && reconnect `cat $CHECKBOX_DATA/iface`
+command: nmcli -t -f UUID con status > $CHECKBOX_DATA/connections && connect_wireless && internet_test --interface=`nmcli dev list | grep -B 1 wireless | grep GENERAL.DEVICE | awk '{print $2}'` && for con in `cat $CHECKBOX_DATA/connections`; do nmcli con up uuid "$con"; done
 _description:
  This test disconnects all connections and then connects to the wireless
  interface. It then checks the connection to confirm it's working as expected.
@@ -111,7 +111,7 @@
 plugin: shell
 name: suspend/wireless_after_suspend
 depends: suspend/suspend_advanced suspend/wireless_before_suspend
-command: connect_wireless && internet_test --interface=`nmcli dev list | grep -B 1 wireless | grep GENERAL.DEVICE | awk '{print $2}'` && reconnect `cat $CHECKBOX_DATA/iface`
+command: connect_wireless && internet_test --interface=`nmcli dev list | grep -B 1 wireless | grep GENERAL.DEVICE | awk '{print $2}'` && for con in `cat $CHECKBOX_DATA/connections`; do nmcli con up uuid "$con"; done
 _description:
  This test checks that the wireless interface is working after suspending the system. It
  disconnects all interfaces and then connects to the wireless interface and checks that the

=== removed file 'scripts/reconnect'
--- scripts/reconnect	2011-08-05 10:56:43 +0000
+++ scripts/reconnect	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-iface=$1
-
-nmcli con up id "$(nmcli -t -f NAME,TYPE con list | grep -m 1 `nmcli dev list iface $iface | grep GENERAL.TYPE | awk '{print $2}'` | awk -F: '{print $1}')"