Merge lp:~bladernr/checkbox/1095713-set-pipefail-on-sleep-jobs into lp:checkbox

[Jeff Lane ]

While looking into the sleep test results Ara noticed that results that indicated a failure were being passed. This was due to the command and checkbox picking up the exit code for tee rather than sleep_test or fwts_test. This is fixed by adding 'set -o pipefail' where appropriate to ensure that the test exit code is what checkbox picks up.

[Zygmunt Krynicki (zyga)]

+1, makes sense

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-02 13:13:29 +0000
+++ debian/changelog	2013-01-03 17:28:23 +0000
@@ -37,6 +37,9 @@
     unity_support_test. They should pipe through ansi_parser like other jobs.
     (LP: #1087777)
   * jobs/info.txt.in - added job info/disk_partitions (LP: #1081833)
+  * jobs/stress.txt.in, jobs/suspend.txt.in - fixed a bug in the command for
+    the suspend jobs where checkbox was getting the exitcode for tee rather
+    than for sleep_test or fwts_test (LP: #1095713)
 
   [Sylvain Pineau]
   * jobs/info.txt.in: Fixed the requirement of info/touchpad_driver.

=== modified file 'jobs/stress.txt.in'
--- jobs/stress.txt.in	2012-11-08 15:37:30 +0000
+++ jobs/stress.txt.in	2013-01-03 17:28:23 +0000
@@ -39,10 +39,10 @@
 command: 
  if type -P fwts >/dev/null; then
   echo "Calling fwts"
-  fwts_test -l $CHECKBOX_DATA/suspend_30_cycles -s s3 --s3-device-check --s3-device-check-delay=30 --s3-sleep-delay=30 --s3-multiple=30 | tee $CHECKBOX_DATA/suspend_30_cycles_times.log
+  set -o pipefail; fwts_test -l $CHECKBOX_DATA/suspend_30_cycles -s s3 --s3-device-check --s3-device-check-delay=30 --s3-sleep-delay=30 --s3-multiple=30 | tee $CHECKBOX_DATA/suspend_30_cycles_times.log
  else
   echo "Calling sleep_test"
-  sleep_test -p s mem -i 30 | tee $CHECKBOX_DATA/suspend_30_cycles_times.log
+  set -o pipefail; sleep_test -p s mem -i 30 | tee $CHECKBOX_DATA/suspend_30_cycles_times.log
  fi
 _description:
  PURPOSE:
@@ -91,10 +91,10 @@
 command:
  if type -P fwts >/dev/null; then
   echo "Calling fwts"
-  fwts_test -l $CHECKBOX_DATA/suspend_250_cycles -s s3 --s3-device-check --s3-device-check-delay=30 --s3-sleep-delay=30 --s3-multiple=250 | tee $CHECKBOX_DATA/suspend_250_cycles_times.log
+  set -o pipefail; fwts_test -l $CHECKBOX_DATA/suspend_250_cycles -s s3 --s3-device-check --s3-device-check-delay=30 --s3-sleep-delay=30 --s3-multiple=250 | tee $CHECKBOX_DATA/suspend_250_cycles_times.log
  else
   echo "Calling sleep_test"
-  sleep_test -p s mem -i 250 | tee $CHECKBOX_DATA/suspend_250_cycles_times.log
+  set -o pipefail; sleep_test -p s mem -i 250 | tee $CHECKBOX_DATA/suspend_250_cycles_times.log
  fi
 _description:
  PURPOSE:

=== modified file 'jobs/suspend.txt.in'
--- jobs/suspend.txt.in	2012-12-12 09:48:07 +0000
+++ jobs/suspend.txt.in	2013-01-03 17:28:23 +0000
@@ -98,10 +98,10 @@
 command:
  if type -P fwts >/dev/null; then
   echo "Calling fwts"
-  fwts_test -l $CHECKBOX_DATA/suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check | tee $CHECKBOX_DATA/suspend_single_times.log
+  set -o pipefail; fwts_test -l $CHECKBOX_DATA/suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check | tee $CHECKBOX_DATA/suspend_single_times.log
  else
   echo "Calling sleep_test"
-  sleep_test -p | tee $CHECKBOX_DATA/suspend_single_times.log
+  set -o pipefail; sleep_test -p | tee $CHECKBOX_DATA/suspend_single_times.log
  fi
 _description:
  PURPOSE: