Merge lp:~mwhudson/launchpad/requestMirror-shouldnt-demote-branch into lp:launchpad

[Michael Hudson-Doyle]

Make requestMirror never move a branch backwards in the list of branches that require mirroring.

[Michael Hudson-Doyle (mwhudson)]

Hi,

This branch makes requestMirror never make next_mirror_time later than it already is.

The implementation is perhaps a little OTT, but it works (I seem to be in a ORM-hating mode currently...).

Cheers,
mwh

[Tim Penhey (thumper)]

Awesome.

review: Approve

=== modified file 'lib/lp/code/model/branch.py'
--- lib/lp/code/model/branch.py	2009-09-25 00:59:30 +0000
+++ lib/lp/code/model/branch.py	2009-10-01 22:49:12 +0000
@@ -849,8 +849,14 @@
         """See `IBranch`."""
         if self.branch_type == BranchType.REMOTE:
             raise BranchTypeError(self.unique_name)
-        self.next_mirror_time = UTC_NOW
-        self.syncUpdate()
+        from canonical.launchpad.interfaces import IStore
+        IStore(self).find(
+            Branch,
+            Branch.id == self.id,
+            Or(Branch.next_mirror_time > UTC_NOW,
+               Branch.next_mirror_time == None)
+            ).set(next_mirror_time=UTC_NOW)
+        self.next_mirror_time = AutoReload
         return self.next_mirror_time
 
     def startMirroring(self):

=== modified file 'lib/lp/code/model/tests/test_branchpuller.py'
--- lib/lp/code/model/tests/test_branchpuller.py	2009-08-04 05:14:32 +0000
+++ lib/lp/code/model/tests/test_branchpuller.py	2009-10-01 22:49:12 +0000
@@ -58,6 +58,26 @@
         branch.requestMirror()
         self.assertEqual(UTC_NOW, branch.next_mirror_time)
 
+    def test_requestMirror_doesnt_demote_branch(self):
+        # requestMirror() sets the mirror request time to 'now' unless
+        # next_mirror_time is already in the past, i.e. calling
+        # requestMirror() doesn't move the branch backwards in the queue of
+        # branches that need mirroring.
+        branch = self.makeAnyBranch()
+        past_time = datetime.now(pytz.UTC) - timedelta(days=1)
+        removeSecurityProxy(branch).next_mirror_time = past_time
+        branch.requestMirror()
+        self.assertEqual(past_time, branch.next_mirror_time)
+
+    def test_requestMirror_can_promote_branch(self):
+        # requestMirror() sets the mirror request time to 'now' if
+        # next_mirror_time is set and in the future.
+        branch = self.makeAnyBranch()
+        future_time = datetime.now(pytz.UTC) - timedelta(days=1)
+        removeSecurityProxy(branch).next_mirror_time = future_time
+        branch.requestMirror()
+        self.assertEqual(UTC_NOW, branch.next_mirror_time)
+
     def test_requestMirrorDuringPull(self):
         """Branches can have mirrors requested while they are being mirrored.
         If so, they should not be removed from the pull queue when the mirror