← Back to team overview

launchpad-reviewers team mailing list archive

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

 

Colin Watson has proposed merging lp:~cjwatson/lazr.jobrunner/oops-0.0.11 into lp:lazr.jobrunner with lp:~cjwatson/lazr.jobrunner/tox as a prerequisite.

Commit message:
Support and require oops >= 0.0.11.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/lazr.jobrunner/oops-0.0.11/+merge/363995
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/lazr.jobrunner/oops-0.0.11 into lp:lazr.jobrunner.
=== modified file 'NEWS.txt'
--- NEWS.txt	2019-03-05 20:29:02 +0000
+++ NEWS.txt	2019-03-05 20:29:02 +0000
@@ -4,6 +4,7 @@
 UNRELEASED
 ----------
 * Add tox testing support.
+* Support and require oops >= 0.0.11.
 
 0.13
 ----

=== modified file 'setup.py'
--- setup.py	2019-03-05 20:29:02 +0000
+++ setup.py	2019-03-05 20:29:02 +0000
@@ -32,7 +32,7 @@
 ]
 
 tests_require = [
-    'oops',
+    'oops>=0.0.11',
     'unittest2',
     'zope.testing',
     ]

=== modified file 'src/lazr/jobrunner/tests/test_celerytask.py'
--- src/lazr/jobrunner/tests/test_celerytask.py	2019-03-05 20:29:02 +0000
+++ src/lazr/jobrunner/tests/test_celerytask.py	2019-03-05 20:29:02 +0000
@@ -257,7 +257,7 @@
         task = RunJob()
         oops_config = oops.Config()
         oops_repository = OOPSTestRepository()
-        oops_config.publishers.append(oops_repository.publish)
+        oops_config.publisher = oops_repository.publish
         task.oops_config = oops_config
         task.job_source = js
         task.run(10)

=== modified file 'src/lazr/jobrunner/tests/test_jobrunner.py'
--- src/lazr/jobrunner/tests/test_jobrunner.py	2013-06-14 00:38:07 +0000
+++ src/lazr/jobrunner/tests/test_jobrunner.py	2019-03-05 20:29:02 +0000
@@ -131,7 +131,7 @@
         report = dict(report)
         report['id'] = oops_id
         self.oopses[oops_id] = report
-        return oops_id
+        return [oops_id]
 
 
 class TestJobRunner(TestCase):
@@ -143,7 +143,7 @@
         self.log_handler.add(self.logger.name)
         self.oops_config = oops.Config()
         self.oops_repository = OOPSTestRepository()
-        self.oops_config.publishers.append(self.oops_repository.publish)
+        self.oops_config.publisher = self.oops_repository.publish
         self.runner = JobRunner(
             logger=self.logger, oops_config=self.oops_config)