Merge lp:~stevenk/lazr.jobrunner/only-run-if-canrun into lp:lazr.jobrunner

[Steve Kowalik]

Only run the job if the job reports that it can run -- that will avoid us doing unnecessary work and then logging an OOPS when BranchScanJob attempt to transition from COMPLETED to RUNNING.

[lp:~stevenk/lazr.jobrunner/only-run-if-canrun]

51. By Steve Kowalik on 2013-06-13

Add canRun method

[William Grant (wgrant)]

review: Approve (code)

[lp:~stevenk/lazr.jobrunner/only-run-if-canrun]

52. By Steve Kowalik on 2013-06-14

Shift from a canRun method to a is_runnable property.

=== modified file 'NEWS.txt'
--- NEWS.txt	2012-10-25 14:03:11 +0000
+++ NEWS.txt	2013-06-14 00:40:33 +0000
@@ -1,7 +1,12 @@
 News
 ====
 
+0.12
+----
+* Only run the job if its is_runnable property is True.
+
 0.11
+----
 * Add indirection to user error handling to avoid oopses if the Job is
   security-proxied.
 

=== modified file 'setup.py'
--- setup.py	2012-10-25 14:03:11 +0000
+++ setup.py	2013-06-14 00:40:33 +0000
@@ -22,7 +22,7 @@
 NEWS = open(os.path.join(here, 'NEWS.txt')).read()
 
 
-version = '0.11'
+version = '0.12'
 
 install_requires = [
     # List your project dependencies here.

=== modified file 'src/lazr/jobrunner/celerytask.py'
--- src/lazr/jobrunner/celerytask.py	2012-07-09 10:58:00 +0000
+++ src/lazr/jobrunner/celerytask.py	2013-06-14 00:40:33 +0000
@@ -41,6 +41,8 @@
 
     def run(self, job_id):
         job = self.job_source.get(job_id)
+        if not job.is_runnable:
+            return None
         try:
             job.acquireLease()
         except LeaseHeld:

=== modified file 'src/lazr/jobrunner/tests/test_jobrunner.py'
--- src/lazr/jobrunner/tests/test_jobrunner.py	2012-10-24 17:57:42 +0000
+++ src/lazr/jobrunner/tests/test_jobrunner.py	2013-06-14 00:40:33 +0000
@@ -96,6 +96,10 @@
     def getOopsVars(self):
         return [('foo', 'bar')]
 
+    @property
+    def is_runnable(self):
+        return True
+
 
 class VolatileAttributesJob:
 

=== modified file 'src/lazr/jobrunner/version.txt'
--- src/lazr/jobrunner/version.txt	2012-10-25 14:03:11 +0000
+++ src/lazr/jobrunner/version.txt	2013-06-14 00:40:33 +0000
@@ -1,1 +1,1 @@
-0.11
+0.12