Checkbox

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

  1. bug1065932
  2. Merge into trunk
Proposed by Brendan Donegan
Status: Merged
Merged at revision: 1764
Proposed branch: lp:~brendan-donegan/checkbox/bug1065932
Merge into: lp:checkbox
Diff against target: 42 lines (+8/-4)
2 files modified
debian/changelog (+4/-0)
jobs/suspend.txt.in (+4/-4)
To merge this branch: bzr merge lp:~brendan-donegan/checkbox/bug1065932
Reviewer Review Type Date Requested Status
Jeff Marcom (community) Approve
Review via email: mp+129414@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Jeff Marcom (jeffmarcom) wrote :

Looks good. Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-10-11 20:48:55 +0000
3+++ debian/changelog 2012-10-12 12:45:18 +0000
4@@ -7,6 +7,10 @@
5 jobs. Added a _description field to each so that the test cases properly
6 appear in the checkbox UI (LP: #1064189)
7
8+ [Brendan Donegan]
9+ * jobs/suspend.txt.in - make sure FWTS logs end with .log so file names
10+ don't get tampered with (LP: #1065932)
11+
12 -- Daniel Manrique <roadmr@ubuntu.com> Wed, 10 Oct 2012 09:45:08 -0400
13
14 checkbox (0.14.6) quantal; urgency=low
15
16=== modified file 'jobs/suspend.txt.in'
17--- jobs/suspend.txt.in 2012-10-11 16:12:10 +0000
18+++ jobs/suspend.txt.in 2012-10-12 12:45:18 +0000
19@@ -99,8 +99,8 @@
20 command:
21 if type -P fwts >/dev/null; then
22 echo "Calling fwts"
23- fwts s3 --s3-sleep-delay=30 -r $CHECKBOX_DATA/suspend_single_log
24- grep 'Critical failures: NONE' $CHECKBOX_DATA/suspend_single_log
25+ fwts s3 --s3-sleep-delay=30 -r $CHECKBOX_DATA/suspend_single.log
26+ grep 'Critical failures: NONE' $CHECKBOX_DATA/suspend_single.log
27 else
28 echo "Calling sleep_test"
29 sleep_test -d
30@@ -125,11 +125,11 @@
31 This is the automated version of suspend/suspend_advanced.
32 user: root
33 environ: CHECKBOX_DATA
34-command: fwts s3 --s3-sleep-delay=30 -r $CHECKBOX_DATA/suspend_single_log || true; grep 'Critical failures: NONE' $CHECKBOX_DATA/suspend_single_log.log
35+command: fwts s3 --s3-sleep-delay=30 -r $CHECKBOX_DATA/suspend_single.log || true; grep 'Critical failures: NONE' $CHECKBOX_DATA/suspend_single.log
36
37 plugin: attachment
38 name: suspend/suspend-single-log-attach
39-command: [ -e $CHECKBOX_DATA/suspend_single_log ] && cat $CHECKBOX_DATA/suspend_single_log
40+command: [ -e $CHECKBOX_DATA/suspend_single.log ] && cat $CHECKBOX_DATA/suspend_single.log
41 _description:
42 Attaches the log from the single suspend/resume test to the results
43

Subscribers

People subscribed via source and target branches