Merge lp:~abentley/launchpad/increase-lease into lp:launchpad/db-devel

[Aaron Bentley]

Increase UpdatePreviewDiffJob timeout to 10 minutes.

= Summary =
Increase the timeout for UpdatePreviewDiffJobs to 10 minutes, to match our
previous setup.

== Proposed fix ==
Change the default duration on acquireLease to 600 seconds.

== Pre-implementation notes ==
None

== Implementation details ==
This introduces a timing-dependent test, however a wide margin (100 seconds) is
given.

Fixed some lint while I was at it.

== Tests ==
bin/test test_branchmergeproposals -t 10_minute_lease

== Demo and Q/A ==

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/code/model/tests/test_branchmergeproposals.py
  lib/lp/code/model/branchmergeproposaljob.py

== Pylint notices ==

lib/lp/code/model/branchmergeproposaljob.py
    22: [F0401] Unable to import 'lazr.delegates' (No module named delegates)
    23: [F0401] Unable to import 'lazr.enum' (No module named enum)

[Paul Hummer (rockstar)]

review: Approve (code)

[Tim Penhey (thumper)]

review: Approve (release-critical)

=== modified file 'lib/lp/code/model/branchmergeproposaljob.py'
--- lib/lp/code/model/branchmergeproposaljob.py	2010-02-04 05:41:32 +0000
+++ lib/lp/code/model/branchmergeproposaljob.py	2010-03-04 17:22:30 +0000
@@ -29,7 +29,6 @@
 from storm.store import Store
 from zope.component import getUtility
 from zope.interface import classProvides, implements
-from zope.security.proxy import removeSecurityProxy
 
 from canonical.database.enumcol import EnumCol
 from canonical.launchpad.database.message import MessageJob, MessageJobAction
@@ -268,6 +267,9 @@
         yield
         server.stop_server()
 
+    def acquireLease(self, duration=600):
+        return self.job.acquireLease(duration)
+
     def run(self):
         """See `IRunnableJob`"""
         preview = PreviewDiff.fromBranchMergeProposal(

=== modified file 'lib/lp/code/model/tests/test_branchmergeproposals.py'
--- lib/lp/code/model/tests/test_branchmergeproposals.py	2010-02-19 02:15:27 +0000
+++ lib/lp/code/model/tests/test_branchmergeproposals.py	2010-03-04 17:22:30 +0000
@@ -54,7 +54,7 @@
 from lp.registry.interfaces.product import IProductSet
 from lp.services.job.runner import JobRunner
 from lp.testing import (
-    capture_events, login_person, TestCaseWithFactory, time_counter)
+    capture_events, login_person, TestCaseWithFactory)
 from lp.testing.factory import GPGSigningContext, LaunchpadObjectFactory
 from lp.testing.mail_helpers import pop_notifications
 
@@ -1839,6 +1839,14 @@
         transaction.commit()
         self.checkExampleMerge(bmp.preview_diff.text)
 
+    def test_10_minute_lease(self):
+        self.useBzrBranches()
+        bmp = self.createExampleMerge()[0]
+        job = UpdatePreviewDiffJob.create(bmp)
+        job.acquireLease()
+        expiry_delta = job.lease_expires - datetime.now(UTC)
+        self.assertTrue(500 <= expiry_delta.seconds, expiry_delta)
+
 
 class TestNextPreviewDiffJob(TestCaseWithFactory):