Merge lp:~bladernr/checkbox/fix-wireless-suspend-tests into lp:checkbox

[Jeff Lane ]

instead of just pushing this to trunk, looking for a review to sanity check removing the bits from wireless_after_suspend that ALSO write to $CHECKBOX_DATA/iface.

That seemed unnecessary if the goal of the iface file is just to ensure we restart the interface that was in use when wireless_before_suspend ran.

I tested this on a thinkpad x201 and had no issues with it changed like this.

[Daniel Manrique (roadmr)]

I tested the commands individually and they seem sane, I also agree that the *after* test doesn't need to write to the iface file, just restore as per what was written there.

And of course, clobbering the file with > instead of appending >> makes a lot of sense, though that would only surface if repeated runs are made without clearing the .checkbox directory; of course, that's an arcane trick so anything that spares end users from pain is welcome.

This looks good so I'll be merging it. Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-21 14:30:39 +0000
+++ debian/changelog	2011-09-22 16:35:48 +0000
@@ -19,8 +19,10 @@
   [Jeff Lane]
   * Fix names of optical drive tests and remove a non-existing test from the
     whitelist (LP: #854808) 
+  * Fix wireless_*_suspend jobs so they recreate iface file instead of append
+    each time (LP: #855845)
 
- -- Daniel Manrique <[e-mail]>  Tue, 20 Sep 2011 15:59:48 -0400
+ -- Jeff Lane <[e-mail]>  Thu, 22 Sep 2011 12:24:03 -0400
 
 checkbox (0.12.7) oneiric; urgency=low
 
 
=== modified file 'jobs/suspend.txt.in'
--- jobs/suspend.txt.in	2011-09-20 20:02:33 +0000
+++ jobs/suspend.txt.in	2011-09-22 16:35:48 +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 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`
 _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: 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: connect_wireless && internet_test --interface=`nmcli dev list | grep -B 1 wireless | grep GENERAL.DEVICE | awk '{print $2}'` && reconnect `cat $CHECKBOX_DATA/iface`
 _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