Merge lp:~abentley/lazr.jobrunner/fix-hacking into lp:lazr.jobrunner

[Aaron Bentley]

Fix numbers in HACKING

Fix list numbers in HACKING.

[Aaron Bentley (abentley)]

review: Approve

=== modified file 'HACKING.txt'
--- HACKING.txt	2012-04-19 20:10:32 +0000
+++ HACKING.txt	2012-10-25 14:36:21 +0000
@@ -30,7 +30,7 @@
     - src/lazr/jobrunner/version.txt
   2) Run 'python setup.py sdist'
   3) Tag the release, e.g. 'bzr tag 0.3'
-  3) Test the generated source distribution in dist/
-  4) Upload to PyPI: 'python setup.py sdist register upload'
-  5) Increase version in setup.py (for next release)
+  4) Test the generated source distribution in dist/
+  5) Upload to PyPI: 'python setup.py sdist register upload'
+  6) Increase version in setup.py (for next release)
 

=== modified file 'NEWS.txt'
--- NEWS.txt	2012-05-14 15:10:15 +0000
+++ NEWS.txt	2012-10-25 14:36:21 +0000
@@ -1,19 +1,46 @@
 News
 ====
 
+0.11
+* Add indirection to user error handling to avoid oopses if the Job is
+  security-proxied.
+
+0.10
+----
+* Tweak clear_queues
+
+* Specify specific kombu and celery versions
+
+0.9
+---
+* Rename inspect_queues to clear_queues
+
+0.8
+---
+* New script: clear-queues
+
+* Comment updates
+
+* Shorter timeout for drain_queues
+
+0.7
+---
+
+* No code changes.
+
 0.6
-___
+---
 
 * Support list_queued for celery tasks.
 
 0.5
-___
+---
 
 * removed: manage RabbitMQ server via testresources, instead of using
   system rabbit
 
 0.4
-___
+---
 
 * manage RabbitMQ server via testresources, instead of using system rabbit
 

=== modified file 'setup.py'
--- setup.py	2012-07-10 09:51:01 +0000
+++ setup.py	2012-10-25 14:36:21 +0000
@@ -22,7 +22,7 @@
 NEWS = open(os.path.join(here, 'NEWS.txt')).read()
 
 
-version = '0.10'
+version = '0.11'
 
 install_requires = [
     # List your project dependencies here.

=== modified file 'src/lazr/jobrunner/jobrunner.py'
--- src/lazr/jobrunner/jobrunner.py	2012-04-19 20:45:05 +0000
+++ src/lazr/jobrunner/jobrunner.py	2012-10-25 14:36:21 +0000
@@ -192,7 +192,7 @@
             try:
                 try:
                     self.runJob(job, fallback)
-                except job.user_error_types, e:
+                except self.userErrorTypes(job), e:
                     self.logger.info(
                         '%s failed with user error %r.'
                         % (self.job_str(job), e))
@@ -211,6 +211,9 @@
     def retryErrorTypes(self, job):
         return job.retry_error_types
 
+    def userErrorTypes(self, job):
+        return job.user_error_types
+
     @staticmethod
     @contextmanager
     def oopsMessage(message):

=== modified file 'src/lazr/jobrunner/tests/test_jobrunner.py'
--- src/lazr/jobrunner/tests/test_jobrunner.py	2012-04-19 19:58:33 +0000
+++ src/lazr/jobrunner/tests/test_jobrunner.py	2012-10-25 14:36:21 +0000
@@ -332,3 +332,25 @@
         runner.runJobHandleError(job)
         self.assertEqual(JobStatus.WAITING, job.status)
         self.assertEqual(1, job.attempt_count)
+
+    def test_runner_obeys_user_error_types_method(self):
+
+        class UserError(Exception):
+            pass
+
+        class UserErrorRunner(JobRunner):
+
+            def userErrorTypes(self, job):
+                return (UserError,)
+
+        runner = UserErrorRunner(
+            logger=self.logger, oops_config=self.oops_config)
+        job = FakeJob(1, UserError('no OOPS expected'))
+        self.assertFalse(job.notifyUserError_called)
+        runner.runJobHandleError(job)
+        self.assertEqual(0, self.oops_repository.oops_count)
+        self.assertEqual(
+            "<FakeJob> (ID 1) failed with user error "
+            "UserError('no OOPS expected',).",
+            self.log_handler.records[-1].msg)
+        self.assertTrue(job.notifyUserError_called)

=== modified file 'src/lazr/jobrunner/version.txt'
--- src/lazr/jobrunner/version.txt	2012-07-10 09:51:01 +0000
+++ src/lazr/jobrunner/version.txt	2012-10-25 14:36:21 +0000
@@ -1,1 +1,1 @@
-0.10
+0.11