lazr.jobrunner

Merge lp:~cjwatson/lazr.jobrunner/oops-0.0.11 into lp:lazr.jobrunner

  1. oops-0.0.11
  2. Merge into trunk
Proposed by Colin Watson
Status: Merged
Merged at revision: 55
Proposed branch: lp:~cjwatson/lazr.jobrunner/oops-0.0.11
Merge into: lp:lazr.jobrunner
Prerequisite: lp:~cjwatson/lazr.jobrunner/tox
Diff against target: 58 lines (+5/-4)
4 files modified
NEWS.txt (+1/-0)
setup.py (+1/-1)
src/lazr/jobrunner/tests/test_celerytask.py (+1/-1)
src/lazr/jobrunner/tests/test_jobrunner.py (+2/-2)
To merge this branch: bzr merge lp:~cjwatson/lazr.jobrunner/oops-0.0.11
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+363995@code.launchpad.net

Commit message

Support and require oops >= 0.0.11.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS.txt'
2--- NEWS.txt 2019-03-05 20:29:02 +0000
3+++ NEWS.txt 2019-03-05 20:29:02 +0000
4@@ -4,6 +4,7 @@
5 UNRELEASED
6 ----------
7 * Add tox testing support.
8+* Support and require oops >= 0.0.11.
9
10 0.13
11 ----
12
13=== modified file 'setup.py'
14--- setup.py 2019-03-05 20:29:02 +0000
15+++ setup.py 2019-03-05 20:29:02 +0000
16@@ -32,7 +32,7 @@
17 ]
18
19 tests_require = [
20- 'oops',
21+ 'oops>=0.0.11',
22 'unittest2',
23 'zope.testing',
24 ]
25
26=== modified file 'src/lazr/jobrunner/tests/test_celerytask.py'
27--- src/lazr/jobrunner/tests/test_celerytask.py 2019-03-05 20:29:02 +0000
28+++ src/lazr/jobrunner/tests/test_celerytask.py 2019-03-05 20:29:02 +0000
29@@ -257,7 +257,7 @@
30 task = RunJob()
31 oops_config = oops.Config()
32 oops_repository = OOPSTestRepository()
33- oops_config.publishers.append(oops_repository.publish)
34+ oops_config.publisher = oops_repository.publish
35 task.oops_config = oops_config
36 task.job_source = js
37 task.run(10)
38
39=== modified file 'src/lazr/jobrunner/tests/test_jobrunner.py'
40--- src/lazr/jobrunner/tests/test_jobrunner.py 2013-06-14 00:38:07 +0000
41+++ src/lazr/jobrunner/tests/test_jobrunner.py 2019-03-05 20:29:02 +0000
42@@ -131,7 +131,7 @@
43 report = dict(report)
44 report['id'] = oops_id
45 self.oopses[oops_id] = report
46- return oops_id
47+ return [oops_id]
48
49
50 class TestJobRunner(TestCase):
51@@ -143,7 +143,7 @@
52 self.log_handler.add(self.logger.name)
53 self.oops_config = oops.Config()
54 self.oops_repository = OOPSTestRepository()
55- self.oops_config.publishers.append(self.oops_repository.publish)
56+ self.oops_config.publisher = self.oops_repository.publish
57 self.runner = JobRunner(
58 logger=self.logger, oops_config=self.oops_config)
59

Subscribers

People subscribed via source and target branches

to all changes: