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

[Brendan Donegan]

This is just a tiny fix to make sure log files for FWTS suspend tests are correctly attached. Ensure that all log filenames end with .log so that FWTS doesn't mess with them.

[Jeff Marcom (jeffmarcom)]

Looks good. Thanks

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-11 20:48:55 +0000
+++ debian/changelog	2012-10-12 12:45:18 +0000
@@ -7,6 +7,10 @@
     jobs. Added a _description field to each so that the test cases properly
     appear in the checkbox UI (LP: #1064189)
 
+  [Brendan Donegan]
+  * jobs/suspend.txt.in - make sure FWTS logs end with .log so file names
+    don't get tampered with (LP: #1065932)
+
  -- Daniel Manrique <[e-mail]>  Wed, 10 Oct 2012 09:45:08 -0400
 
 checkbox (0.14.6) quantal; urgency=low
 
=== modified file 'jobs/suspend.txt.in'
--- jobs/suspend.txt.in	2012-10-11 16:12:10 +0000
+++ jobs/suspend.txt.in	2012-10-12 12:45:18 +0000
@@ -99,8 +99,8 @@
 command:
  if type -P fwts >/dev/null; then
   echo "Calling fwts"
-  fwts s3 --s3-sleep-delay=30 -r $CHECKBOX_DATA/suspend_single_log
-  grep 'Critical failures: NONE' $CHECKBOX_DATA/suspend_single_log
+  fwts s3 --s3-sleep-delay=30 -r $CHECKBOX_DATA/suspend_single.log
+  grep 'Critical failures: NONE' $CHECKBOX_DATA/suspend_single.log
  else
   echo "Calling sleep_test"
   sleep_test -d
@@ -125,11 +125,11 @@
  This is the automated version of suspend/suspend_advanced.
 user: root
 environ: CHECKBOX_DATA
-command: fwts s3 --s3-sleep-delay=30 -r $CHECKBOX_DATA/suspend_single_log || true; grep 'Critical failures: NONE' $CHECKBOX_DATA/suspend_single_log.log
+command: fwts s3 --s3-sleep-delay=30 -r $CHECKBOX_DATA/suspend_single.log || true; grep 'Critical failures: NONE' $CHECKBOX_DATA/suspend_single.log
 
 plugin: attachment
 name: suspend/suspend-single-log-attach
-command: [ -e $CHECKBOX_DATA/suspend_single_log ] && cat $CHECKBOX_DATA/suspend_single_log
+command: [ -e $CHECKBOX_DATA/suspend_single.log ] && cat $CHECKBOX_DATA/suspend_single.log
 _description:
  Attaches the log from the single suspend/resume test to the results