Checkbox

Merge lp:~cr3/checkbox/861218 into lp:checkbox

  1. 861218
  2. Merge into trunk
Proposed by Marc Tardif
Status: Merged
Merged at revision: 1080
Proposed branch: lp:~cr3/checkbox/861218
Merge into: lp:checkbox
Diff against target: 23 lines (+2/-1)
2 files modified
checkbox/job.py (+1/-1)
debian/changelog (+1/-0)
To merge this branch: bzr merge lp:~cr3/checkbox/861218
Reviewer Review Type Date Requested Status
Jeff Lane  Approve
Review via email: mp+77403@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jeff Lane  (bladernr) wrote :

Nice! Tested with the test case that created this mess and dependencies seem to be followed. Tried using mediacard and suspend/resume tests, and this does indeed make the _after_suspend tests run after suspend instead of before.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'checkbox/job.py'
2--- checkbox/job.py 2011-09-09 14:53:48 +0000
3+++ checkbox/job.py 2011-09-28 20:50:28 +0000
4@@ -121,7 +121,7 @@
5 # TODO: Apply dependencies
6 if "depends" in job:
7 for depends in job["depends"]:
8- for filename in self._find_matching_messages(suite=job.get("suite")):
9+ for filename in self._find_matching_messages():
10 message = self._read_message(filename)
11 if job["name"] in message.get("depends", []):
12 new_filename = self._get_next_message_filename()
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2011-09-28 20:06:31 +0000
16+++ debian/changelog 2011-09-28 20:50:28 +0000
17@@ -41,6 +41,7 @@
18
19 [Marc Tardif]
20 * Added support for wildcards when verifying the transport certificate.
21+ * Applying depends across suites (LP: #861218)
22
23 -- Jeff Lane <jeff@ubuntu.com> Wed, 28 Sep 2011 16:06:18 -0400
24

Subscribers

People subscribed via source and target branches