Merge lp:~kfogel/launchpad/255868-patches-view-from-bugs-page into lp:launchpad/db-devel

[Karl Fogel]

[Karl Fogel (kfogel)]

Put a "bugs with patches" statistic in the upper right portlet box on the bugs page (for products, project groups, and any other foo that has a "bugs.launchpad.net/foo" page.

[Karl Fogel (kfogel)]

Requesting review on UI only right now, as still writing tests.

[Karl Fogel (kfogel)]

See the two most recent screenshots in the linked bug, for UI review.

[lp:~kfogel/launchpad/255868-patches-view-from-bugs-page]

9005. By Karl Fogel on 2010-02-17

Merge from db-devel.

[Curtis Hovey (sinzui)]

Hi Karl.

This UI change is consistent with the rest of the page, and I think it is good to land. As I said on IRC, this list is now long and I think we are committed to rethink the list if we want to add another report to this page--a problem we can solve in the future.

review: Approve (ui)

[lp:~kfogel/launchpad/255868-patches-view-from-bugs-page]

9006. By Karl Fogel on 2010-02-17

Tests for Bug #255868: link to "+patches" view from product bugs page.

* lib/lp/bugs/stories/xx-bugs-statistics-portlet.txt:
  Extend test output to expect the new item.

9007. By Karl Fogel on 2010-02-18

Add tests for Bug #255868 (link to "+patches" view from product bugs page).

* lib/lp/bugs/tests/bug.py: Import print_table.
  (print_bugfilters_portlet_unfilled,
   print_bugfilters_portlet_filled): New functions.

* lib/lp/bugs/stories/xx-bugs-statistics-portlet.txt:
  (print_portlet, print_portlet_contents): Remove, as these
  have now been moved to bug.py and renamed as per above.
  Use the replacements, and extend expected test output to
  include the new "bugs with patches" item.

* lib/lp/bugs/stories/patches-view/patches-view.txt:
  Add tests for the presence and accuracy of the new stats.

9008. By Karl Fogel on 2010-02-18

Merge from db-devel.

9009. By Karl Fogel on 2010-02-18

For bug #255868 (link to "+patches" view from product bugs page),
include all statuses in count of bugs with patches, and update
tests accordingly. Also, fix a missing import in one test file.

* lib/lp/bugs/browser/bugtask.py: Import RESOLVED_BUGTASK_STATUSES.
  (BugsStatsMixin.bugs_with_patches_count): Include all bugs in count.

* lib/lp/bugs/stories/patches-view/patches-view.txt: Expect
  5 bugs with patches now, instead of 4, due to above change.

* lib/lp/bugs/stories/xx-bugs-statistics-portlet.txt: Import
  print_bugfilters_portlet_unfilled, print_bugfilters_portlet_filled.

[Karl Fogel (kfogel)]

I've now added tests for the feature. Also, I tweaked the behavior slightly after talking with Jorge Castro: it now shows the count of bugs-with-patches including both resolved and unresolved bugs. The reason for this is that it may be an upstream dev coming to look at patches, whereas the resolution might be set by a distro maintainer who doesn't necessarily have upstream in mind. (Also, this makes the bugfilter stats portlet count consistent with what we show on the +patches view page that the portlet links to.)

Jorge and I agree to check with users of the feature after a few weeks to see how things are working out.

[Curtis Hovey (sinzui)]

Thanks for providing the tests, and more thanks for refactoring them.

review: Approve (ui and code)

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2010-02-16 15:08:03 +0000
+++ lib/lp/bugs/browser/bugtask.py	2010-02-19 06:44:15 +0000
@@ -109,7 +109,8 @@
     IDistroSeriesBugTask, IFrontPageBugTaskSearch,
     INominationsReviewTableBatchNavigator, INullBugTask, IPersonBugTaskSearch,
     IProductSeriesBugTask, IRemoveQuestionFromBugTaskForm, IUpstreamBugTask,
-    IUpstreamProductBugTaskSearch, UNRESOLVED_BUGTASK_STATUSES)
+    IUpstreamProductBugTaskSearch, UNRESOLVED_BUGTASK_STATUSES,
+    RESOLVED_BUGTASK_STATUSES)
 from lp.bugs.interfaces.bugtracker import BugTrackerType
 from lp.bugs.interfaces.cve import ICveSet
 from lp.registry.interfaces.distribution import IDistribution
@@ -1848,6 +1849,14 @@
             params.assignee = self.user
             return self.context.searchTasks(params).count()
 
+    @property
+    def bugs_with_patches_count(self):
+        """A count of unresolved bugs with patches."""
+        return self.context.searchTasks(
+            None, user=self.user,
+            status=(UNRESOLVED_BUGTASK_STATUSES + RESOLVED_BUGTASK_STATUSES),
+            omit_duplicates=True, has_patch=True).count()
+
 
 class BugListingPortletInfoView(LaunchpadView, BugsInfoMixin):
     """Portlet containing available bug listings without stats."""

=== modified file 'lib/lp/bugs/stories/patches-view/patches-view.txt'
--- lib/lp/bugs/stories/patches-view/patches-view.txt	2010-02-03 19:54:01 +0000
+++ lib/lp/bugs/stories/patches-view/patches-view.txt	2010-02-19 06:44:15 +0000
@@ -402,3 +402,92 @@
     Hierarchy: Patchy Person > Patch attachments for Patchy Person
     Tabs: ...
     Main heading: Patch attachments for Patchy Person
+
+Reaching the Patches View
+-------------------------
+
+The patches view is linked to from a portlet on the product bugs page.
+
+    >>> from lp.bugs.tests.bug import (
+    ...     print_bugfilters_portlet_unfilled,
+    ...     print_bugfilters_portlet_filled)
+    >>> print_bugfilters_portlet_unfilled(anon_browser, 'patchy-product-1')
+    Open bugs
+    Critical bugs
+    Bugs fixed elsewhere
+    New bugs
+    Open CVE bugs - CVE reports
+    Bugs need forwarding upstream
+    Bugs with patches
+    Subscribe to bug mail
+      --> http://bugs.launchpad.dev/patchy-product-1/+subscribe
+
+    >>> print_bugfilters_portlet_filled(anon_browser, 'patchy-product-1')
+    3 Open bugs
+    1 Critical bugs
+    0 Bugs fixed elsewhere
+    1 New bugs
+    0 Open CVE bugs - CVE reports
+    3 Bugs need forwarding upstream
+    3 Bugs with patches
+
+It's also linked to from a portlet on the source package bugs page:
+
+    >>> print_bugfilters_portlet_filled(anon_browser, 'ubuntu/+source/a52dec')
+    1 Open bugs
+    0 Critical bugs
+    1 Bugs fixed elsewhere
+    0 New bugs
+    0 Open CVE bugs
+    1 Bug with a patch
+
+And from a portlet on the distro series bugs page:
+
+    >>> print_bugfilters_portlet_filled(anon_browser, 'ubuntu/hoary')
+    2 Open bugs
+    0 Critical bugs
+    0 Bugs fixed elsewhere
+    2 New bugs
+    1 Open CVE bugs - CVE reports
+    0 Incomplete bugs (can expire)
+    1 Bug with a patch
+
+And from a portlet on the distro bugs page:
+
+    >>> print_bugfilters_portlet_filled(anon_browser, 'ubuntu')
+    8 Open bugs
+    0 Critical bugs
+    2 Bugs fixed elsewhere
+    6 New bugs
+    2 Open CVE bugs - CVE reports
+    0 Incomplete bugs (can expire)
+    5 Bugs with patches
+
+The number of bugs with patches shown in the bugfilter stats portlet
+might be lower than the number of bugs (bugtasks) listed on the
+corresponding patches view page, because the latter shows resolved
+bugs too.
+
+    >>> anon_browser.open('http://bugs.launchpad.dev/ubuntu/+patches')
+    >>> show_patches_view(anon_browser.contents)
+    Bug                        Importance    Status    Package    Patch Age
+    Bug #18: bug_c title          High       Triaged   a52dec     ...second...
+    From: Patchy Person
+    Link: patch_f.diff
+    description of patch f
+    Bug #18: bug_c title        Undecided      New     ubuntu     ...second...
+    From: Patchy Person
+    Link: patch_f.diff
+    description of patch f
+    Bug #17: bug_b title        Undecided      New     ubuntu     ...second...
+    From: Patchy Person
+    Link: patch_c.diff
+    description of patch c
+    Bug #16: bug_a title         Medium    Fix Released evolution ...second...
+    From: Patchy Person
+    Link: patch_a.diff
+    description of patch a
+    Bug #16: bug_a title        Undecided      New     ubuntu     ...second...
+    From: Patchy Person
+    Link: patch_a.diff
+    description of patch a

=== modified file 'lib/lp/bugs/stories/xx-bugs-statistics-portlet.txt'
--- lib/lp/bugs/stories/xx-bugs-statistics-portlet.txt	2009-11-27 17:25:33 +0000
+++ lib/lp/bugs/stories/xx-bugs-statistics-portlet.txt	2010-02-19 06:44:15 +0000
@@ -6,27 +6,6 @@
 served in a separate request; the request is issued via Javascript and
 inserted into the page later.
 
-    >>> from BeautifulSoup import BeautifulSoup
-
-    >>> def print_portlet(browser, path):
-    ...     browser.open(
-    ...         'http://bugs.launchpad.dev/%s/+portlet-bugfilters' % path)
-    ...     table = BeautifulSoup(browser.contents).find('table', 'bug-links')
-    ...     tbody_info, tbody_links = table('tbody')
-    ...     print_table(tbody_info)
-    ...     for link in tbody_links('a'):
-    ...         text = extract_text(link)
-    ...         if len(text) > 0:
-    ...             print "%s\n  --> %s" % (text, link['href'])
-
-    >>> def print_portlet_contents(browser, path):
-    ...     browser.open(
-    ...         'http://bugs.launchpad.dev'
-    ...         '/%s/+bugtarget-portlet-bugfilters-stats' % path)
-    ...     table = BeautifulSoup('<table>%s</table>' % browser.contents)
-    ...     print_table(table)
-
-
 == Distribution ==
 
     >>> path = 'debian'
@@ -34,42 +13,49 @@
 If the user is not logged-in a subscribe link is shown along with some
 general stats.
 
-    >>> print_portlet(anon_browser, path)
+    >>> from lp.bugs.tests.bug import (
+    ...     print_bugfilters_portlet_unfilled,
+    ...     print_bugfilters_portlet_filled)
+    >>> print_bugfilters_portlet_unfilled(anon_browser, path)
     Open bugs
     Critical bugs
     Bugs fixed elsewhere
     New bugs
     Open CVE bugs - CVE reports
+    Bugs with patches
     Subscribe to bug mail
       --> http://bugs.launchpad.dev/debian/+subscribe
 
-    >>> print_portlet_contents(anon_browser, path)
+    >>> print_bugfilters_portlet_filled(anon_browser, path)
     3 Open bugs
     0 Critical bugs
     0 Bugs fixed elsewhere
     1 New bugs
     2 Open CVE bugs - CVE reports
+    0 Bugs with patches
 
 Once the user has identified him or herself, information on assigned
 bugs is also shown.
 
-    >>> print_portlet(user_browser, path)
+    >>> print_bugfilters_portlet_unfilled(user_browser, path)
     Open bugs
     Bugs assigned to me
     Critical bugs
     Bugs fixed elsewhere
     New bugs
     Open CVE bugs - CVE reports
+    Bugs with patches
     Subscribe to bug mail
       --> http://bugs.launchpad.dev/debian/+subscribe
 
-    >>> print_portlet_contents(user_browser, path)
+    >>> print_bugfilters_portlet_filled(user_browser, path)
     3 Open bugs
     0 Bugs assigned to me
     0 Critical bugs
     0 Bugs fixed elsewhere
     1 New bugs
     2 Open CVE bugs - CVE reports
+    0 Bugs with patches
 
 The content includes a link to the distribution CVE report.
 
@@ -84,46 +70,50 @@
 If the user is not logged-in general stats are shown. There is also a
 link to review nominations.
 
-    >>> print_portlet(anon_browser, path)
+    >>> print_bugfilters_portlet_unfilled(anon_browser, path)
     Open bugs
     Critical bugs
     Bugs fixed elsewhere
     New bugs
     Open CVE bugs - CVE reports
+    Bugs with patches
     Subscribe to bug mail
       --> http://bugs.launchpad.dev/debian/woody/+subscribe
     Review nominations
       --> http://bugs.launchpad.dev/debian/woody/+nominations
 
-    >>> print_portlet_contents(anon_browser, path)
+    >>> print_bugfilters_portlet_filled(anon_browser, path)
     2 Open bugs
     0 Critical bugs
     0 Bugs fixed elsewhere
     2 New bugs
     1 Open CVE bugs - CVE reports
+    0 Bugs with patches
 
 Once the user has identified him or herself, information on assigned
 bugs is also shown.
 
-    >>> print_portlet(user_browser, path)
+    >>> print_bugfilters_portlet_unfilled(user_browser, path)
     Open bugs
     Bugs assigned to me
     Critical bugs
     Bugs fixed elsewhere
     New bugs
     Open CVE bugs - CVE reports
+    Bugs with patches
     Subscribe to bug mail
       --> http://bugs.launchpad.dev/debian/woody/+subscribe
     Review nominations
       --> http://bugs.launchpad.dev/debian/woody/+nominations
 
-    >>> print_portlet_contents(user_browser, path)
+    >>> print_bugfilters_portlet_filled(user_browser, path)
     2 Open bugs
     0 Bugs assigned to me
     0 Critical bugs
     0 Bugs fixed elsewhere
     2 New bugs
     1 Open CVE bugs - CVE reports
+    0 Bugs with patches
 
 The content includes a link to the distribution CVE report.
 
@@ -137,42 +127,46 @@
 
 If the user is not logged-in general stats are shown.
 
-    >>> print_portlet(anon_browser, path)
+    >>> print_bugfilters_portlet_unfilled(anon_browser, path)
     Open bugs
     Critical bugs
     Bugs fixed elsewhere
     New bugs
     Open CVE bugs
+    Bugs with patches
     Subscribe to bug mail
       --> http://bugs.launchpad.dev/debian/+source/mozilla-firefox/+subscribe
 
-    >>> print_portlet_contents(anon_browser, path)
+    >>> print_bugfilters_portlet_filled(anon_browser, path)
     3 Open bugs
     0 Critical bugs
     0 Bugs fixed elsewhere
     1 New bugs
     2 Open CVE bugs
+    0 Bugs with patches
 
 Once the user has identified him or herself, information on assigned
 bugs is also shown.
 
-    >>> print_portlet(user_browser, path)
+    >>> print_bugfilters_portlet_unfilled(user_browser, path)
     Open bugs
     Bugs assigned to me
     Critical bugs
     Bugs fixed elsewhere
     New bugs
     Open CVE bugs
+    Bugs with patches
     Subscribe to bug mail
       --> http://bugs.launchpad.dev/debian/+source/mozilla-firefox/+subscribe
 
-    >>> print_portlet_contents(user_browser, path)
+    >>> print_bugfilters_portlet_filled(user_browser, path)
     3 Open bugs
     0 Bugs assigned to me
     0 Critical bugs
     0 Bugs fixed elsewhere
     1 New bugs
     2 Open CVE bugs
+    0 Bugs with patches
 
 Note that the "CVE reports" link is not shown above; distribution
 source packages do not have a CVE reports page.
@@ -190,38 +184,42 @@
 If the user is not logged-in general stats are shown. There is no
 option to subscribe to bug mail.
 
-    >>> print_portlet(anon_browser, path)
+    >>> print_bugfilters_portlet_unfilled(anon_browser, path)
     Open bugs
     Critical bugs
     Bugs fixed elsewhere
     New bugs
     Open CVE bugs
+    Bugs with patches
 
-    >>> print_portlet_contents(anon_browser, path)
+    >>> print_bugfilters_portlet_filled(anon_browser, path)
     2 Open bugs
     0 Critical bugs
     0 Bugs fixed elsewhere
     2 New bugs
     1 Open CVE bugs
+    0 Bugs with patches
 
 Once the user has identified him or herself, information on assigned
 bugs is also shown.
 
-    >>> print_portlet(user_browser, path)
+    >>> print_bugfilters_portlet_unfilled(user_browser, path)
     Open bugs
     Bugs assigned to me
     Critical bugs
     Bugs fixed elsewhere
     New bugs
     Open CVE bugs
-
-    >>> print_portlet_contents(user_browser, path)
+    Bugs with patches
+    
+    >>> print_bugfilters_portlet_filled(user_browser, path)
     2 Open bugs
     0 Bugs assigned to me
     0 Critical bugs
     0 Bugs fixed elsewhere
     2 New bugs
     1 Open CVE bugs
+    0 Bugs with patches
 
 Note that the "CVE reports" link is not shown above; source packages
 do not have a CVE reports page.
@@ -238,42 +236,46 @@
 
 If the user is not logged-in general stats are shown.
 
-    >>> print_portlet(anon_browser, path)
+    >>> print_bugfilters_portlet_unfilled(anon_browser, path)
     Open bugs
     Critical bugs
     Bugs fixed elsewhere
     New bugs
     Open CVE bugs
+    Bugs with patches
     Subscribe to bug mail
       --> http://bugs.launchpad.dev/mozilla/+subscribe
 
-    >>> print_portlet_contents(anon_browser, path)
+    >>> print_bugfilters_portlet_filled(anon_browser, path)
     4 Open bugs
     1 Critical bugs
     0 Bugs fixed elsewhere
     4 New bugs
     1 Open CVE bugs
+    0 Bugs with patches
 
 Once the user has identified him or herself, information on assigned
 bugs is also shown.
 
-    >>> print_portlet(user_browser, path)
+    >>> print_bugfilters_portlet_unfilled(user_browser, path)
     Open bugs
     Bugs assigned to me
     Critical bugs
     Bugs fixed elsewhere
     New bugs
     Open CVE bugs
+    Bugs with patches
     Subscribe to bug mail
       --> http://bugs.launchpad.dev/mozilla/+subscribe
 
-    >>> print_portlet_contents(user_browser, path)
+    >>> print_bugfilters_portlet_filled(user_browser, path)
     4 Open bugs
     0 Bugs assigned to me
     1 Critical bugs
     0 Bugs fixed elsewhere
     4 New bugs
     1 Open CVE bugs
+    0 Bugs with patches
 
 Note that the "CVE reports" link is not shown above; project groups do
 not have a CVE reports page.
@@ -290,42 +292,46 @@
 
 If the user is not logged-in general stats are shown.
 
-    >>> print_portlet(anon_browser, path)
+    >>> print_bugfilters_portlet_unfilled(anon_browser, path)
     Open bugs
     Critical bugs
     Bugs fixed elsewhere
     New bugs
     Open CVE bugs - CVE reports
+    Bugs with patches
     Subscribe to bug mail
       --> http://bugs.launchpad.dev/firefox/+subscribe
 
-    >>> print_portlet_contents(anon_browser, path)
+    >>> print_bugfilters_portlet_filled(anon_browser, path)
     3 Open bugs
     1 Critical bugs
     0 Bugs fixed elsewhere
     3 New bugs
     1 Open CVE bugs - CVE reports
+    0 Bugs with patches
 
 Once the user has identified him or herself, information on assigned
 bugs is also shown.
 
-    >>> print_portlet(user_browser, path)
+    >>> print_bugfilters_portlet_unfilled(user_browser, path)
     Open bugs
     Bugs assigned to me
     Critical bugs
     Bugs fixed elsewhere
     New bugs
     Open CVE bugs - CVE reports
+    Bugs with patches
     Subscribe to bug mail
       --> http://bugs.launchpad.dev/firefox/+subscribe
 
-    >>> print_portlet_contents(user_browser, path)
+    >>> print_bugfilters_portlet_filled(user_browser, path)
     3 Open bugs
     0 Bugs assigned to me
     1 Critical bugs
     0 Bugs fixed elsewhere
     3 New bugs
     1 Open CVE bugs - CVE reports
+    0 Bugs with patches
 
 
 The content includes a link to the distribution CVE report.

=== modified file 'lib/lp/bugs/templates/bugtarget-portlet-bugfilters-content.pt'
--- lib/lp/bugs/templates/bugtarget-portlet-bugfilters-content.pt	2009-11-27 14:44:44 +0000
+++ lib/lp/bugs/templates/bugtarget-portlet-bugfilters-content.pt	2010-02-19 06:44:15 +0000
@@ -64,4 +64,14 @@
       </a>
     </td>
   </tr>
+  <tr tal:define="count view/bugs_with_patches_count|nothing;
+                  plural string: Bugs with patches;
+                  singular string: Bug with a patch;">
+    <td class="bugs-count" tal:content="count"/>
+    <td class="bugs-link">
+      <a tal:attributes="href string:${context/fmt:url}/+patches">
+      <metal:message use-macro="context/@@+base-layout-macros/plural-message"/>
+      </a>
+    </td>
+  </tr>
 </tal:portlet-bug-filters-content>

=== modified file 'lib/lp/bugs/tests/bug.py'
--- lib/lp/bugs/tests/bug.py	2010-01-19 20:45:38 +0000
+++ lib/lp/bugs/tests/bug.py	2010-02-19 06:44:15 +0000
@@ -16,7 +16,8 @@
 
 from canonical.launchpad.ftests import sync
 from canonical.launchpad.testing.pages import (
-    extract_text, find_tag_by_id, find_main_content, find_tags_by_class)
+    extract_text, find_tag_by_id, find_main_content, find_tags_by_class,
+    print_table)
 from lp.bugs.interfaces.bug import CreateBugParams, IBugSet
 from lp.bugs.interfaces.bugtask import BugTaskStatus, IBugTaskSet
 from lp.bugs.interfaces.bugwatch import IBugWatchSet
@@ -279,3 +280,46 @@
         if text_field is not None:
             text_control = browser.getControl(name=text_field.get('name'))
             print '    [%s]' % text_control.value.ljust(10)
+
+
+def print_bugfilters_portlet_unfilled(browser, target):
+    """Print the raw, unfilled contents of the bugfilters portlet.
+
+    This is the contents before any actual data has been fetched.
+    (The portlet is normally populated with data by a separate
+    javascript call, to avoid delaying the overall page load.  Use
+    print_bugfilters_portlet_filled() to test the populated portlet.)
+
+    :param browser  browser from which to extract the content.
+    :param target   entity from whose bugs page to fetch the portlet
+                    (e.g., http://bugs.launchpad.dev/TARGET/...)
+    """
+    browser.open(
+        'http://bugs.launchpad.dev/%s/+portlet-bugfilters' % target)
+    table = BeautifulSoup(browser.contents).find('table', 'bug-links')
+    tbody_info, tbody_links = table('tbody')
+    print_table(tbody_info)
+    for link in tbody_links('a'):
+        text = extract_text(link)
+        if len(text) > 0:
+            print "%s\n  --> %s" % (text, link['href'])
+
+
+def print_bugfilters_portlet_filled(browser, target):
+    """Print the filled-in contents of the bugfilters portlet.
+
+    This is the contents after the actual data has been fetched.
+    (The portlet is normally populated with data by a separate
+    javascript call, to avoid delaying the overall page load.  Use
+    print_bugfilters_portlet_unfilled() to test the unpopulated
+    portlet.)
+
+    :param browser  browser from which to extract the content.
+    :param target   entity from whose bugs page to fetch the portlet
+                    (e.g., http://bugs.launchpad.dev/TARGET/...)
+    """
+    browser.open(
+        'http://bugs.launchpad.dev'
+        '/%s/+bugtarget-portlet-bugfilters-stats' % target)
+    table = BeautifulSoup('<table>%s</table>' % browser.contents)
+    print_table(table)