Merge lp:~sylvain-pineau/checkbox/bug934051 into lp:checkbox

Proposed by Sylvain Pineau
Status: Merged
Merged at revision: 1268
Proposed branch: lp:~sylvain-pineau/checkbox/bug934051
Merge into: lp:checkbox
Diff against target: 45 lines (+6/-3)
3 files modified
debian/changelog (+3/-0)
jobs/info.txt.in (+2/-2)
jobs/suspend.txt.in (+1/-1)
To merge this branch: bzr merge lp:~sylvain-pineau/checkbox/bug934051
Reviewer Review Type Date Requested Status
Marc Tardif (community) Approve
Review via email: mp+93545@code.launchpad.net

Description of the change

A small fix for depends fields in info ans suspend jobs.
I've updated the changelog hoping it'll be enough to have it in 0.13.3

To post a comment you must log in.
1269. By Sylvain Pineau

Changelog update

Revision history for this message
Marc Tardif (cr3) wrote :

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-02-16 16:23:42 +0000
3+++ debian/changelog 2012-02-17 10:08:17 +0000
4@@ -2,6 +2,9 @@
5
6 [Javier Collado]
7 * Fixed running of disk/read_performance tests (LP: #933528)
8+
9+ [Sylvain Pineau]
10+ * Fix depends fields in info and suspend test suites (LP: #934051)
11
12 -- Marc Tardif <marc@ubuntu.com> Thu, 16 Feb 2012 10:31:18 -0500
13
14
15=== modified file 'jobs/info.txt.in'
16--- jobs/info.txt.in 2011-11-15 14:38:23 +0000
17+++ jobs/info.txt.in 2012-02-17 10:08:17 +0000
18@@ -86,13 +86,13 @@
19
20 plugin: attachment
21 name: screenshot.png
22-depends: screenshot
23+depends: info/screenshot
24 command: cat ${CHECKBOX_DATA}/screenshot.png
25 _description: Attaches the screenshot captured in info/screenshot.
26
27 plugin: attachment
28 name: fwts_log
29-depends: fwts_test
30+depends: miscellanea/fwts_test
31 _description: Gather log from the Firmware Test Suite run.
32 command:
33 cat $CHECKBOX_DATA/fwts_results.log
34
35=== modified file 'jobs/suspend.txt.in'
36--- jobs/suspend.txt.in 2012-02-01 14:26:58 +0000
37+++ jobs/suspend.txt.in 2012-02-17 10:08:17 +0000
38@@ -92,7 +92,7 @@
39
40 plugin: shell
41 name: suspend/network_after_suspend
42-depends: suspend/suspend_advanced networking/network_before_suspend
43+depends: suspend/suspend_advanced suspend/network_before_suspend
44 _description: Test the network after resuming.
45 command: network_wait; internet_test | diff $CHECKBOX_DATA/network_before_suspend.txt -
46

Subscribers

People subscribed via source and target branches