Merge lp:~thumper/launchpad/fix-branch-active-reviews into lp:launchpad

[Tim Penhey]

Defer to date_created for work in progress merge proposals on the branch active reviews page.

[Tim Penhey (thumper)]

https://code.edge.launchpad.net/~bzr-pqm/bzr/bzr.dev/+activereviews oopses due to a work in progress proposal. The code that decides on the date to sort by didn't used to take into account branches that were neither in review, nor reviewed.

tests:
  TestBranchMergeProposalListingItem

[Michael Hudson-Doyle (mwhudson)]

Aside from the "probress" typo, it looks good.

review: Approve

[Stuart Bishop (stub)]

Looks good.

review: Approve

=== modified file 'lib/lp/code/browser/branchmergeproposallisting.py'
--- lib/lp/code/browser/branchmergeproposallisting.py	2010-01-14 23:19:13 +0000
+++ lib/lp/code/browser/branchmergeproposallisting.py	2010-01-18 09:43:16 +0000
@@ -112,8 +112,10 @@
         """
         if self.context.date_review_requested is not None:
             return self.context.date_review_requested
-        else:
+        elif self.context.date_reviewed is not None:
             return self.context.date_reviewed
+        else:
+            return self.context.date_created
 
 
 class BranchMergeProposalListingBatchNavigator(TableBatchNavigator):

=== modified file 'lib/lp/code/browser/tests/test_branchmergeproposallisting.py'
--- lib/lp/code/browser/tests/test_branchmergeproposallisting.py	2010-01-14 23:39:06 +0000
+++ lib/lp/code/browser/tests/test_branchmergeproposallisting.py	2010-01-18 09:43:16 +0000
@@ -10,7 +10,6 @@
 
 import pytz
 import transaction
-from zope.publisher.interfaces import NotFound
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.launchpad.webapp.servers import LaunchpadTestRequest
@@ -298,6 +297,14 @@
         item = BranchMergeProposalListingItem(bmp, None, None)
         self.assertEqual(review_date, item.sort_key)
 
+    def test_sort_key_wip(self):
+        # If the proposal is a work in progress, the date_created is used.
+        bmp = self.factory.makeBranchMergeProposal(
+            date_created=datetime(2009,6,1,tzinfo=pytz.UTC))
+        login_person(bmp.target_branch.owner)
+        item = BranchMergeProposalListingItem(bmp, None, None)
+        self.assertEqual(bmp.date_created, item.sort_key)
+
 
 class ActiveReviewSortingTest(TestCaseWithFactory):
     """Test the sorting of the active review groups."""