Merge lp:~roadmr/checkbox/no-log-in-stress-suspend into lp:checkbox

[Daniel Manrique]

fixes a few inconsistencies in how the sleep_test fallback command for suspend/hibernate stress tests is called.

This fixes a few inconsistencies in how the sleep_test fallback command for suspend/hibernate stress tests is called.

This won't fix the related bug (1186870) but makes things behave more consistently.

[Jeff Lane  (bladernr)]

souds reasonable to me. as discussed, the proper fix is to fix the script to output the correct stuffs... perhaps we should demote the bug to Low and fix Jeffrey's bug as we have time.

review: Approve

[Jeff Lane  (bladernr)]

yikes... hold one... sigh... change the log file names to match the non _times_ log names.

The times names are used specifically for the sleep_time_check test as they are parsed. We are not saving the times for hibernate/resume as we dont care one bit how long that takes.

Hibernate/resume can take anywhere from a minute or two to 5 or more depending on how much ram is installed, how many pages had to be swapped to disk, how fast disk IO is, how much stuff the CPU has to do on resume, etc... it's just too wide to be reliable and too long to be of consequence, and no one cares about fixing hibernate resume time issues anyway.

review: Needs Fixing

[lp:~roadmr/checkbox/no-log-in-stress-suspend]

2162. By Daniel Manrique on 2013-06-03

Fixed log file names since sleep_test does not generate timing information here

[Daniel Manrique (roadmr)]

Fixed as requested, thanks!

review: Needs Resubmitting

[Jeff Lane  (bladernr)]

awesome!

review: Approve

=== modified file 'checkbox-old/debian/changelog'
--- checkbox-old/debian/changelog	2013-06-03 15:01:37 +0000
+++ checkbox-old/debian/changelog	2013-06-03 21:09:27 +0000
@@ -15,6 +15,9 @@
     appropriate radio button in showTest if the test already has a result set
     rather than just defaulting to skip always (LP: #1181952)
 
+  [ Daniel Manrique ]
+  * jobs/stress.txt.in: fixed a few inconsistent invocations of sleep_test.
+
  -- Brendan Donegan <[e-mail]>  Fri, 31 May 2013 16:04:42 +0100
 
 checkbox (0.16.3) saucy; urgency=low
 
=== modified file 'checkbox-old/jobs/stress.txt.in'
--- checkbox-old/jobs/stress.txt.in	2013-05-29 07:50:30 +0000
+++ checkbox-old/jobs/stress.txt.in	2013-06-03 21:09:27 +0000
@@ -19,7 +19,7 @@
   fwts_test -l $CHECKBOX_DATA/hibernate_30_cycles -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 --s4-multiple=30
  else
   echo "Calling sleep_test"
-  sleep_test -s disk -i 30 -w 120
+  set -o pipefail; sleep_test -s disk -i 30 -w 120 | tee $CHECKBOX_DATA/hibernate_30_cycles.log
  fi
 _description:
  PURPOSE:
@@ -48,7 +48,7 @@
   set -o pipefail; fwts_test -l $CHECKBOX_DATA/suspend_30_cycles -f none -s s3 --s3-device-check --s3-device-check-delay=45 --s3-sleep-delay=30 --s3-multiple=30 | tee $CHECKBOX_DATA/suspend_30_cycles_times.log
  else
   echo "Calling sleep_test"
-  set -o pipefail; 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.log
  fi
 _description:
  PURPOSE:
@@ -83,7 +83,7 @@
   fwts_test -l $CHECKBOX_DATA/hibernate_250_cycles -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 --s4-multiple=250
  else
   echo "Calling sleep_test"
-  sleep_test -s disk -i 250 -w 120
+  set -o pipefail; sleep_test -s disk -i 250 -w 120 | tee $CHECKBOX_DATA/hibernate_250_cycles.log
  fi
 _description:
  PURPOSE:
@@ -106,7 +106,7 @@
   set -o pipefail; fwts_test -l $CHECKBOX_DATA/suspend_250_cycles -s s3 --s3-device-check --s3-device-check-delay=45 --s3-sleep-delay=30 --s3-multiple=250 | tee $CHECKBOX_DATA/suspend_250_cycles_times.log
  else
   echo "Calling sleep_test"
-  set -o pipefail; 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.log
  fi
 _description:
  PURPOSE: