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

Proposed by Brendan Donegan
Status: Merged
Approved by: Daniel Manrique
Approved revision: 1965
Merged at revision: 1965
Proposed branch: lp:~brendan-donegan/checkbox/bug1149288
Merge into: lp:checkbox
Diff against target: 33 lines (+5/-1)
3 files modified
data/whitelists/sniff.whitelist (+2/-0)
debian/changelog (+2/-0)
jobs/miscellanea.txt.in (+1/-1)
To merge this branch: bzr merge lp:~brendan-donegan/checkbox/bug1149288
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+151953@code.launchpad.net

Description of the change

As noticed by CE QA, the sources-list test was broken by the changes to the sources_test script. This branch updates the test to get the parameters passed to the script as it expects.

To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

Looks OK, thanks!

One question, how are users supposed to define the parameters? using environment variables? just curious.

review: Approve
Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

They're supposed to define them in the job command, so that you can have different tests for different sources lists

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/whitelists/sniff.whitelist'
2--- data/whitelists/sniff.whitelist 2013-01-02 21:59:05 +0000
3+++ data/whitelists/sniff.whitelist 2013-03-06 13:29:31 +0000
4@@ -33,3 +33,5 @@
5 __suspend__
6 suspend/suspend_advanced
7 suspend/suspend-time-check
8+__miscellanea__
9+miscellanea/sources-list
10
11=== modified file 'debian/changelog'
12--- debian/changelog 2013-03-04 16:00:27 +0000
13+++ debian/changelog 2013-03-06 13:29:31 +0000
14@@ -4,6 +4,8 @@
15 * Incremented version number.
16 * scripts/sources_test - modified script so that it takes sources list
17 location and repository list as arguments
18+ * jobs/miscellanea.txt.in - provide REPOSITORY and SOURCES_LIST environment
19+ variables to the sources_test script (LP: #1149288)
20
21 [ Daniel Manrique ]
22 * Added pipefail option to a few jobs using ansi_parser (LP: #1131598)
23
24=== modified file 'jobs/miscellanea.txt.in'
25--- jobs/miscellanea.txt.in 2013-01-07 08:53:00 +0000
26+++ jobs/miscellanea.txt.in 2013-03-06 13:29:31 +0000
27@@ -67,5 +67,5 @@
28
29 plugin: shell
30 name: miscellanea/sources-list
31-command: sources_test
32+command: sources_test $SOURCES_LIST "$REPOSITORIES"
33 _description: Checks that a specified sources list file contains the requested repositories

Subscribers

People subscribed via source and target branches