Merge lp:~adeuring/launchpad/bug-532078 into lp:launchpad/db-devel

[Abel Deuring]

This branch fixes bug 532048: Count of bugs with patches is wrong, +patches shows different information

The cause is simple: While BugTarget.searchTasks() is used both by BugsStatsMixin.bugs_with_patches_count to retrive the number of bugs with patches and by BugsPatchesView.batchedPatchTasks() to retrieve the bugs to show, they pass different sets of bug tasks statuses to searchParams(): BugsStatsMixin.bugs_with_patches_count used all statused except UNKNOWN, while BugsPatchesView.batchedPatchTasks() excluded in addition WONTFIX and INVALID.

I added unit tests for BugsStatsMixin.bugs_with_patches_count and BugsPatchesView to ensure that they include the same sets of bugtasks.

test: ./bin/test -vv -t test_bugtarget_patches_view

= 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/bugs/browser/bugtask.py
  lib/lp/bugs/browser/tests/test_bugtarget_patches_view.py

== Pylint notices ==

lib/lp/bugs/browser/bugtask.py
    78: [F0401] Unable to import 'lazr.delegates' (No module named delegates)
    79: [F0401] Unable to import 'lazr.enum' (No module named enum)
    81: [F0401] Unable to import 'lazr.lifecycle.event' (No module named lifecycle)
    82: [F0401] Unable to import 'lazr.lifecycle.snapshot' (No module named lifecycle)
    83: [F0401] Unable to import 'lazr.restful.interface' (No module named restful)
    84: [F0401] Unable to import 'lazr.restful.interfaces' (No module named restful)
    100: [F0401] Unable to import 'lazr.uri' (No module named uri)
    155: [F0401] Unable to import 'lazr.restful.interfaces' (No module named restful)

[Graham Binns (gmb)]

review: Approve (code)

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2010-03-01 11:28:05 +0000
+++ lib/lp/bugs/browser/bugtask.py	2010-03-08 09:24:33 +0000
@@ -114,7 +114,7 @@
     INominationsReviewTableBatchNavigator, INullBugTask, IPersonBugTaskSearch,
     IProductSeriesBugTask, IRemoveQuestionFromBugTaskForm, IUpstreamBugTask,
     IUpstreamProductBugTaskSearch, UNRESOLVED_BUGTASK_STATUSES,
-    RESOLVED_BUGTASK_STATUSES)
+    UNRESOLVED_PLUS_FIXRELEASED_BUGTASK_STATUSES)
 from lp.bugs.interfaces.bugtracker import BugTrackerType
 from lp.bugs.interfaces.cve import ICveSet
 from lp.registry.interfaces.distribution import IDistribution
@@ -1886,7 +1886,7 @@
         """A count of unresolved bugs with patches."""
         return self.context.searchTasks(
             None, user=self.user,
-            status=(UNRESOLVED_BUGTASK_STATUSES + RESOLVED_BUGTASK_STATUSES),
+            status=UNRESOLVED_PLUS_FIXRELEASED_BUGTASK_STATUSES,
             omit_duplicates=True, has_patch=True).count()
 
 

=== added file 'lib/lp/bugs/browser/tests/test_bugtarget_patches_view.py'
--- lib/lp/bugs/browser/tests/test_bugtarget_patches_view.py	1970-01-01 00:00:00 +0000
+++ lib/lp/bugs/browser/tests/test_bugtarget_patches_view.py	2010-03-08 09:24:33 +0000
@@ -0,0 +1,102 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+__metaclass__ = type
+
+
+import unittest
+
+from canonical.launchpad.ftests import login
+from canonical.launchpad.webapp.servers import LaunchpadTestRequest
+from canonical.testing import LaunchpadFunctionalLayer
+
+from lp.bugs.browser.bugtarget import BugsPatchesView
+from lp.bugs.browser.bugtask import BugListingPortletStatsView
+from lp.bugs.interfaces.bugtask import BugTaskStatus
+from lp.testing import TestCaseWithFactory
+
+
+DISPLAY_BUG_STATUS_FOR_PATCHES = {
+    BugTaskStatus.NEW:  True,
+    BugTaskStatus.INCOMPLETE: True,
+    BugTaskStatus.INVALID: False,
+    BugTaskStatus.WONTFIX: False,
+    BugTaskStatus.CONFIRMED: True,
+    BugTaskStatus.TRIAGED: True,
+    BugTaskStatus.INPROGRESS: True,
+    BugTaskStatus.FIXCOMMITTED: True,
+    BugTaskStatus.FIXRELEASED: True,
+    BugTaskStatus.UNKNOWN: False,
+    }
+
+
+class TestBugTargetPatchCountBase(TestCaseWithFactory):
+
+    layer = LaunchpadFunctionalLayer
+
+    def setUp(self):
+        super(TestBugTargetPatchCountBase, self).setUp()
+        login('[e-mail]')
+        self.product = self.factory.makeProduct()
+
+    def makeBugWithPatch(self, status):
+        bug = self.factory.makeBug(
+            product=self.product, owner=self.product.owner)
+        self.factory.makeBugAttachment(bug=bug, is_patch=True)
+        bug.default_bugtask.transitionToStatus(status, user=bug.owner)
+
+
+class TestBugTargetPatchView(TestBugTargetPatchCountBase):
+
+    def setUp(self):
+        super(TestBugTargetPatchView, self).setUp()
+        self.view = BugsPatchesView(self.product, LaunchpadTestRequest())
+
+    def test_status_of_bugs_with_patches_shown(self):
+        # Bugs with patches that have the status INVALID, WONTFIX,
+        # UNKNOWN are not shown in the +patches view; all other
+        # bugs are shown.
+        number_of_bugs_shown = 0
+        for bugtask_status in DISPLAY_BUG_STATUS_FOR_PATCHES:
+            if DISPLAY_BUG_STATUS_FOR_PATCHES[bugtask_status]:
+                number_of_bugs_shown += 1
+            self.makeBugWithPatch(bugtask_status)
+            batched_tasks = self.view.batchedPatchTasks()
+            self.assertEqual(
+                batched_tasks.batch.listlength, number_of_bugs_shown,
+                "Unexpected number of bugs with patches displayed for status "
+                "%s" % bugtask_status)
+
+
+class TestBugListingPortletStatsView(TestBugTargetPatchCountBase):
+
+    def setUp(self):
+        super(TestBugListingPortletStatsView, self).setUp()
+        self.view = BugListingPortletStatsView(
+            self.product, LaunchpadTestRequest())
+
+    def test_bugs_with_patches_count(self):
+        # Bugs with patches that have the status INVALID, WONTFIX,
+        # UNKNOWN are not counted in
+        # BugListingPortletStatsView.bugs_with_patches_count, bugs
+        # with all other statuses are counted.
+        number_of_bugs_shown = 0
+        for bugtask_status in DISPLAY_BUG_STATUS_FOR_PATCHES:
+            if DISPLAY_BUG_STATUS_FOR_PATCHES[bugtask_status]:
+                number_of_bugs_shown += 1
+            self.makeBugWithPatch(bugtask_status)
+            self.assertEqual(
+                self.view.bugs_with_patches_count, number_of_bugs_shown,
+                "Unexpected number of bugs with patches displayed for status "
+                "%s" % bugtask_status)
+
+
+def test_suite():
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(TestBugTargetPatchView))
+    suite.addTest(unittest.makeSuite(TestBugListingPortletStatsView))
+    return suite
+
+
+if __name__ == '__main__':
+    unittest.TextTestRunner().run(test_suite())