Merge lp:~brian-murray/launchpad/bug-546078 into lp:launchpad

[Brian Murray]

This branch modifies the +patches view so that bug tasks that a person, or team, are structurally subscribed to appear in the +patches view in addition to those that already appear. This fixes bug 546078.

Additionally, some drive by fixes, for issues I found when reading code, were made:
adding the new expired status to the test_bugtarget_patches_view.py test
wording change of expired definition in lib/lp/bugs/interfaces/bugtask.py
wording change of doc string for get_related_bugtasks_search_params in lib/lp/bugs/model/bugtask.py
typo fix for distribution drivers in lib/lp/bugs/stories/structural-subscriptions/xx-bug-subscriptions.txt

Tests modified:
lib/lp/bugs/doc/bugtask-search.txt
lib/lp/bugs/stories/patches-view/patches-view.txt

[Eleanor Berger (intellectronica)]

Very nice, everything looks pretty good, but there's, I think, one problem. If I understand the code correctly, this works only for subscriptions to products, not to other subscription targets (like packages, project groups, etc). When or before fixing this, it's worth extending the test to cover those other subscription targets too.

review: Needs Information

[Eleanor Berger (intellectronica)]

As we discussed on IRC, this branch now looks very good. We had one concern, over duplicate results because of the UNION of a subscription to a target and its parent target (like Product and ProjectGroup), so you're going to verify that this isn't the case and fix that if necessary. After that you can land.

review: Approve

=== modified file 'lib/lp/bugs/browser/tests/test_bugtarget_patches_view.py'
--- lib/lp/bugs/browser/tests/test_bugtarget_patches_view.py	2010-03-11 22:14:51 +0000
+++ lib/lp/bugs/browser/tests/test_bugtarget_patches_view.py	2010-06-07 18:13:25 +0000
@@ -15,7 +15,6 @@
 from lp.bugs.interfaces.bugtask import BugTaskStatus
 from lp.testing import TestCaseWithFactory
 
-
 DISPLAY_BUG_STATUS_FOR_PATCHES = {
     BugTaskStatus.NEW:  True,
     BugTaskStatus.INCOMPLETE: True,
@@ -27,6 +26,7 @@
     BugTaskStatus.FIXCOMMITTED: True,
     BugTaskStatus.FIXRELEASED: False,
     BugTaskStatus.UNKNOWN: False,
+    BugTaskStatus.EXPIRED: False
     }
 
 
@@ -54,8 +54,8 @@
 
     def test_status_of_bugs_with_patches_shown(self):
         # Bugs with patches that have the status FIXRELEASED, INVALID,
-        # WONTFIX, UNKNOWN are not shown in the +patches view; all other
-        # bugs are shown.
+        # WONTFIX, UNKNOWN, EXPIRED 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]:

=== modified file 'lib/lp/bugs/doc/bugtask-search.txt'
--- lib/lp/bugs/doc/bugtask-search.txt	2010-04-12 07:53:48 +0000
+++ lib/lp/bugs/doc/bugtask-search.txt	2010-06-07 18:13:25 +0000
@@ -92,8 +92,8 @@
 
 === Product bug supervisor ===
 
-If No Privileges is specified as Firefox' bug supervisor, searching for his
-bugs return all of Firefox' bugs.
+If No Privileges is specified as Firefox's bug supervisor, searching for his
+bugs return all of Firefox's bugs.
 
     >>> login('[e-mail]')
     >>> from canonical.launchpad.ftests import syncUpdate
@@ -989,7 +989,7 @@
     4 2
     5 1
 
-Similary, we can search for bugs that do not have any linked branches.
+Similarly, we can search for bugs that do not have any linked branches.
 
     >>> from lp.bugs.interfaces.bugtask import BugBranchSearch
     >>> search_params = BugTaskSearchParams(
@@ -1197,3 +1197,170 @@
     ...     importance=[BugTaskImportance.LOW, BugTaskImportance.MEDIUM]))
     4 Mozilla Firefox Reflow problems with complex page layouts NEW MEDIUM
     1 Mozilla Firefox Firefox does not support SVG NEW LOW
+
+
+== Searching by structural subscriber ==
+
+The 'structural_subscriber' search parameter allows one to search all the bug
+tasks to which a person is structurally subscribed. A person can be a
+structural subscriber for a product, a product series, a project, a milestone,
+a distribution, a distribution series and a distribution source package. No
+Privileges Person isn't a structural subscriber, so no bug tasks are found:
+
+    >>> from canonical.launchpad.interfaces import IPersonSet
+    >>> no_priv = getUtility(IPersonSet).getByName('no-priv')
+    >>> no_priv_struct_sub = BugTaskSearchParams(
+    ...     user=None, structural_subscriber=no_priv)
+    >>> found_bugtasks = bugtask_set.search(no_priv_struct_sub)
+    >>> found_bugtasks.count()
+    0
+
+Create a new person and make them a subscriber to all Firefox (product) bug
+reports.  Subsequently, we confirm that they are subscribed to all of the
+Firefox bug tasks.
+
+    >>> product_struct_subber = factory.makePerson(
+    ...     name='product-struct-subber')
+    >>> firefox.addBugSubscription(product_struct_subber,
+    ...     product_struct_subber)
+    <StructuralSubscription at ...>
+    >>> product_struct_sub_search = BugTaskSearchParams(
+    ...     user=None, structural_subscriber=product_struct_subber)
+    >>> found_bugtasks = bugtask_set.search(product_struct_sub_search)
+    >>> found_bugtasks.count()
+    7
+
+Create a new person and subscribe them to all of the bug tasks for a product
+series.  We then test to see that they are subscribed to all of the bug tasks
+for the product series in which they are interested.
+
+    >>> product_series = firefox.getSeries('1.0')
+    >>> all_targeted = BugTaskSearchParams(user=None, omit_targeted=False)
+    >>> series_tasks = product_series.searchTasks(all_targeted)
+    >>> series_struct_subber = factory.makePerson(
+    ...     name='series-struct-subber')
+    >>> product_series.addBugSubscription(series_struct_subber,
+    ...     series_struct_subber)
+    <StructuralSubscription at ...>
+    >>> series_struct_sub_search = BugTaskSearchParams(
+    ...     user=None, structural_subscriber=series_struct_subber)
+    >>> found_bugtasks = bugtask_set.search(series_struct_sub_search)
+    >>> found_bugtasks.count()
+    2
+
+Create a new product which will be a part of a project group.  A bug is
+created for the product which should then show up for structural subscribers
+of the project group.  Then a new person is created who is subscribed to all
+of the bug reports about the project. Search for bug tasks that this new
+person is subscribed.
+
+    >>> product = factory.makeProduct()
+    >>> bug = factory.makeBug(product=product)
+    >>> project = factory.makeProject()
+    >>> product.project = project
+    >>> project_struct_subber = factory.makePerson(
+    ...     name='project-struct-subber')
+    >>> project.addBugSubscription(project_struct_subber,
+    ...     project_struct_subber)
+    <StructuralSubscription at ...>
+    >>> project_struct_sub_search = BugTaskSearchParams(
+    ...     user=None, structural_subscriber=project_struct_subber)
+    >>> found_bugtasks = bugtask_set.search(project_struct_sub_search)
+    >>> found_bugtasks.count()
+    1
+
+We will also subscribe this project subscriber to a product that is a part of
+the project and ensure that duplicate bug tasks do not appear in the search
+results.
+
+    >>> product2 = factory.makeProduct()
+    >>> bug = factory.makeBug(product=product2)
+    >>> product2.project = project
+    >>> product2.addBugSubscription(project_struct_subber,
+    ...     project_struct_subber)
+    <StructuralSubscription at ...>
+    >>> project_struct_sub_search = BugTaskSearchParams(
+    ...     user=None, structural_subscriber=project_struct_subber)
+    >>> found_bugtasks = bugtask_set.search(project_struct_sub_search)
+    >>> found_bugtasks.count()
+    2
+
+Create a new person and subscribe them to all of bug tasks targeted to a
+milestone.  We then test to see that they are subscribed to all of the
+bug tasks for the milestone in which they are interested.
+
+    >>> milestone_struct_subber = factory.makePerson(
+    ...     name='milestone-struct-subber')
+    >>> product_milestone.addBugSubscription(milestone_struct_subber,
+    ...     milestone_struct_subber)
+    <StructuralSubscription at ...>
+    >>> milestone_struct_sub_search = BugTaskSearchParams(
+    ...     user=None, structural_subscriber=milestone_struct_subber)
+    >>> found_bugtasks = bugtask_set.search(milestone_struct_sub_search)
+    >>> found_bugtasks.count()
+    2
+
+Create another new person and subscribe them to all the Ubuntu bug reports -
+crazy I know.  Then test to see that this poor person is subscribed to all
+bugs with an Ubuntu bug task.
+
+    >>> distro_struct_subber = factory.makePerson(
+    ...     name='distro-struct-subber')
+    >>> ubuntu.addBugSubscription(distro_struct_subber,
+    ...     distro_struct_subber)
+    <StructuralSubscription at ...>
+    >>> distro_struct_sub_search = BugTaskSearchParams(
+    ...     user=None, structural_subscriber=distro_struct_subber)
+    >>> found_bugtasks = bugtask_set.search(distro_struct_sub_search)
+    >>> found_bugtasks.count()
+    5
+
+Create a new person who will only be subscribed to an Ubuntu series, which is
+something more reasonable than all of Ubuntu.  Test to ensure that this person
+is subscribed to all of the bug tasks about that distro series.
+
+    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
+    >>> hoary = ubuntu.getSeries('hoary')
+    >>> distro_series_struct_subber = factory.makePerson(
+    ...     name='distro-series-struct-subber')
+    >>> hoary.addBugSubscription(distro_series_struct_subber,
+    ...     distro_series_struct_subber)
+    <StructuralSubscription at ...>
+    >>> distro_series_struct_sub_search = BugTaskSearchParams(
+    ...     user=None, structural_subscriber=distro_series_struct_subber)
+    >>> found_bugtasks = bugtask_set.search(distro_series_struct_sub_search)
+    >>> all_targeted = BugTaskSearchParams(user=None, omit_targeted=False)
+    >>> hoary_bugtasks = hoary.searchTasks(all_targeted)
+    >>> found_bugtasks.count() == hoary_bugtasks.count()
+    True
+
+Create a new person and make them a subscriber to all Ubuntu Firefox (a
+distribution source package) bug reports.  Test to see that the new person is
+subscribed to all of the Ubuntu Firefox bug tasks.
+
+    >>> package_struct_subber = factory.makePerson(
+    ...     name='package-struct-subber')
+    >>> ubuntu_firefox.addBugSubscription(package_struct_subber,
+    ...     package_struct_subber)
+    <StructuralSubscription at ...>
+    >>> package_struct_sub_search = BugTaskSearchParams(
+    ...     user=None, structural_subscriber=package_struct_subber)
+    >>> found_bugtasks = bugtask_set.search(package_struct_sub_search)
+    >>> found_bugtasks.count()
+    1
+
+We'll also subscribe the person who is currently subscribed to a package's bug
+reports, package_struct_subber, to the bug reports of a product series to
+ensure that the structural_subscriber search is returning the set of both bug
+tasks.
+
+    >>> product_series.addBugSubscription(package_struct_subber,
+    ...     package_struct_subber)
+    <StructuralSubscription at ...>
+    >>> package_struct_sub_search = BugTaskSearchParams(
+    ...     user=None, structural_subscriber=package_struct_subber)
+    >>> found_bugtasks = bugtask_set.search(package_struct_sub_search)
+    >>> combined_bugtasks_count = (ubuntu_firefox_bugs.count () +
+    ...    series_tasks.count())
+    >>> found_bugtasks.count() == combined_bugtasks_count
+    True

=== modified file 'lib/lp/bugs/interfaces/bug.py'
--- lib/lp/bugs/interfaces/bug.py	2010-06-04 02:29:33 +0000
+++ lib/lp/bugs/interfaces/bug.py	2010-06-07 18:13:25 +0000
@@ -97,7 +97,7 @@
         False in a boolean context, or an AssertionError will be raised.
 
         If distribution is specified, sourcepackagename may optionally
-        be provided. product must evaluate to False in a boolean
+        be provided. Product must evaluate to False in a boolean
         context, or an AssertionError will be raised.
         """
         assert product or distribution, (

=== modified file 'lib/lp/bugs/interfaces/bugtarget.py'
--- lib/lp/bugs/interfaces/bugtarget.py	2010-05-06 01:46:55 +0000
+++ lib/lp/bugs/interfaces/bugtarget.py	2010-06-07 18:13:25 +0000
@@ -76,6 +76,7 @@
         bug_supervisor=Reference(schema=Interface),
         bug_commenter=Reference(schema=Interface),
         bug_subscriber=Reference(schema=Interface),
+        structural_subscriber=Reference(schema=Interface),
         owner=Reference(schema=Interface),
         affected_user=Reference(schema=Interface),
         has_patch=copy_field(IBugTaskSearch['has_patch']),
@@ -184,7 +185,8 @@
                     hardware_owner_is_bug_reporter=None,
                     hardware_owner_is_affected_by_bug=False,
                     hardware_owner_is_subscribed_to_bug=False,
-                    hardware_is_linked_to_bug=False, linked_branches=None):
+                    hardware_is_linked_to_bug=False, linked_branches=None,
+                    structural_subscriber=None):
         """Search the IBugTasks reported on this entity.
 
         :search_params: a BugTaskSearchParams object

=== modified file 'lib/lp/bugs/interfaces/bugtask.py'
--- lib/lp/bugs/interfaces/bugtask.py	2010-05-25 16:45:26 +0000
+++ lib/lp/bugs/interfaces/bugtask.py	2010-06-07 18:13:25 +0000
@@ -175,7 +175,7 @@
     EXPIRED = DBItem(19, """
         Expired
 
-        This bug is expired. There was no activity since a longer time.
+        This bug is expired. There was no activity for a long time.
         """)
 
     CONFIRMED = DBItem(20, """
@@ -1075,7 +1075,7 @@
                  hardware_owner_is_affected_by_bug=False,
                  hardware_owner_is_subscribed_to_bug=False,
                  hardware_is_linked_to_bug=False,
-                 linked_branches=None
+                 linked_branches=None, structural_subscriber=None
                  ):
 
         self.bug = bug
@@ -1120,6 +1120,7 @@
             hardware_owner_is_subscribed_to_bug)
         self.hardware_is_linked_to_bug = hardware_is_linked_to_bug
         self.linked_branches = linked_branches
+        self.structural_subscriber = structural_subscriber
 
     def setProduct(self, product):
         """Set the upstream context on which to filter the search."""
@@ -1192,7 +1193,8 @@
                        hardware_owner_is_bug_reporter=None,
                        hardware_owner_is_affected_by_bug=False,
                        hardware_owner_is_subscribed_to_bug=False,
-                       hardware_is_linked_to_bug=False, linked_branches=None):
+                       hardware_is_linked_to_bug=False, linked_branches=None,
+                       structural_subscriber=None):
         """Create and return a new instance using the parameter list."""
         search_params = cls(user=user, orderby=order_by)
 
@@ -1260,6 +1262,7 @@
         search_params.hardware_is_linked_to_bug = (
             hardware_is_linked_to_bug)
         search_params.linked_branches=linked_branches
+        search_params.structural_subscriber = structural_subscriber
 
         return search_params
 

=== modified file 'lib/lp/bugs/model/bugtarget.py'
--- lib/lp/bugs/model/bugtarget.py	2010-04-19 08:31:01 +0000
+++ lib/lp/bugs/model/bugtarget.py	2010-06-07 18:13:25 +0000
@@ -51,6 +51,7 @@
                     importance=None,
                     assignee=None, bug_reporter=None, bug_supervisor=None,
                     bug_commenter=None, bug_subscriber=None, owner=None,
+                    structural_subscriber=None,
                     affected_user=None, affects_me=False,
                     has_patch=None, has_cve=None, distribution=None,
                     tags=None, tags_combinator=BugTagsSearchCombinator.ALL,

=== modified file 'lib/lp/bugs/model/bugtask.py'
--- lib/lp/bugs/model/bugtask.py	2010-05-27 13:51:06 +0000
+++ lib/lp/bugs/model/bugtask.py	2010-06-07 18:13:25 +0000
@@ -149,7 +149,7 @@
     search for all tasks related to a user given by `context`.
 
     Which tasks are related to a user?
-      * the user has to be either assignee or owner of this tasks
+      * the user has to be either assignee or owner of this task
         OR
       * the user has to be subscriber or commenter to the underlying bug
         OR
@@ -158,7 +158,8 @@
         always get one task owned by the bug reporter
     """
     assert IPerson.providedBy(context), "Context argument needs to be IPerson"
-    relevant_fields = ('assignee', 'bug_subscriber', 'owner', 'bug_commenter')
+    relevant_fields = ('assignee', 'bug_subscriber', 'owner', 'bug_commenter',
+                       'structural_subscriber')
     search_params = []
     for key in relevant_fields:
         # all these parameter default to None
@@ -1641,6 +1642,48 @@
                     BugSubscription.person = %(personid)s""" %
                     sqlvalues(personid=params.subscriber.id))
 
+        if params.structural_subscriber is not None:
+            structural_subscriber_clause = ( """BugTask.id IN (
+                SELECT BugTask.id FROM BugTask, StructuralSubscription
+                WHERE BugTask.product = StructuralSubscription.product
+                    AND StructuralSubscription.subscriber = %(personid)s
+                UNION ALL
+                SELECT BugTask.id FROM BugTask, StructuralSubscription
+                WHERE
+                    BugTask.distribution = StructuralSubscription.distribution
+                    AND BugTask.sourcepackagename =
+                        StructuralSubscription.sourcepackagename
+                    AND StructuralSubscription.subscriber = %(personid)s
+                UNION ALL
+                SELECT BugTask.id FROM BugTask, StructuralSubscription
+                WHERE
+                    BugTask.distroseries = StructuralSubscription.distroseries
+                    AND StructuralSubscription.subscriber = %(personid)s
+                UNION ALL
+                SELECT BugTask.id FROM BugTask, StructuralSubscription
+                WHERE
+                    BugTask.milestone = StructuralSubscription.milestone
+                    AND StructuralSubscription.subscriber = %(personid)s
+                UNION ALL
+                SELECT BugTask.id FROM BugTask, StructuralSubscription
+                WHERE
+                    BugTask.productseries = StructuralSubscription.productseries
+                    AND StructuralSubscription.subscriber = %(personid)s
+                UNION ALL
+                SELECT BugTask.id FROM BugTask, StructuralSubscription, Product
+                WHERE
+                    BugTask.product = Product.id
+                    AND Product.project = StructuralSubscription.project
+                    AND StructuralSubscription.subscriber = %(personid)s
+                UNION ALL
+                SELECT BugTask.id FROM BugTask, StructuralSubscription
+                WHERE
+                    BugTask.distribution = StructuralSubscription.distribution
+                    AND StructuralSubscription.sourcepackagename is NULL
+                    AND StructuralSubscription.subscriber = %(personid)s)""" %
+                sqlvalues(personid=params.structural_subscriber))
+            extra_clauses.append(structural_subscriber_clause)
+
         if params.component:
             clauseTables += ["SourcePackagePublishingHistory",
                              "SourcePackageRelease"]

=== modified file 'lib/lp/bugs/stories/patches-view/patches-view.txt'
--- lib/lp/bugs/stories/patches-view/patches-view.txt	2010-04-16 13:01:51 +0000
+++ lib/lp/bugs/stories/patches-view/patches-view.txt	2010-06-07 18:13:25 +0000
@@ -431,6 +431,100 @@
     Tabs: ...
     Main heading: Patch attachments for Patchy Person
 
+The patches view for a person or team will also show patches to which a person
+or team is structurally subscribed.  Structural subscription searching is
+thoroughly tested in bugtask-search.txt so here a single structural
+subscription will be tested.
+
+    >>> from canonical.launchpad.ftests import login, logout
+    >>> project_subscriber = factory.doAsUser(
+    ...     '[e-mail]', factory.makePerson,
+    ...     name="project-subscriber", displayname="Project Subscriber")
+    >>> login('[e-mail]')
+    >>> patchy_product.addBugSubscription(project_subscriber,
+    ...     project_subscriber)
+    <StructuralSubscription at ...>
+    >>> logout()
+    >>> from zope.security.proxy import removeSecurityProxy
+    >>> subscriber_name = removeSecurityProxy(project_subscriber).name
+    >>> anon_browser.open(
+    ...     'http://bugs.launchpad.dev/~%s/+patches' % subscriber_name)
+    >>> show_patches_view(anon_browser.contents)
+    Bug                  Importance  Status        Project          Patch Age
+    Bug #18: bug_c title Wishlist  Fix Committed patchy-product-1 ...second...
+    From: Patchy Person
+    Link: patch_f.diff
+    description of patch f
+    Bug #17: bug_b title Critical  Confirmed     patchy-product-1 ...second...
+    From: Patchy Person
+    Link: patch_c.diff
+    description of patch c
+    Bug #16: bug_a title Undecided New           patchy-product-1 ...second...
+    From: Patchy Person
+    Link: patch_a.diff
+    description of patch a
+
+To ensure that all bugs with patches are shown for every structural
+subscription a new bug and is made to affect the evolution source package for
+Ubuntu.  Additionally, a patch is added to that bug report so that it will
+show up in the +patches view.  Project-subscriber is then subscribed to the
+evolution source package for Ubuntu and it is tested that both groups of
+patches are shown.
+
+    >>> hacky_product = factory.doAsUser(
+    ...     '[e-mail]', factory.makeProduct,
+    ...     name='hacky-product', displayname="Hacky Product")
+    >>> transaction.commit()
+    >>> bug_e = factory.doAsUser(
+    ...     '[e-mail]', make_bug,
+    ...     title="bug_e is for evolution", product=hacky_product,
+    ...     importance=BugTaskImportance.WISHLIST,
+    ...     status=BugTaskStatus.NEW)
+    >>> factory.doAsUser(
+    ...     '[e-mail]', factory.makeBugAttachment,
+    ...     comment="comment about patch h",
+    ...     filename="patch_h.diff", owner=patch_submitter,
+    ...     description="patch h is for helping", bug=bug_e, is_patch=True)
+    <BugAttachment at...
+    >>> factory.doAsUser(
+    ...     '[e-mail]', make_bugtask, bug=bug_e,
+    ...     target='evolution', target_is_spkg_name=True,
+    ...     importance=BugTaskImportance.MEDIUM,
+    ...     status=BugTaskStatus.TRIAGED)
+    >>> transaction.commit()
+    >>> from canonical.launchpad.ftests import login, logout
+    >>> from zope.component import getUtility
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> login('[e-mail]')
+    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
+    >>> ubuntu_evolution = ubuntu.getSourcePackage("evolution")
+    >>> ubuntu_evolution.addBugSubscription(project_subscriber,
+    ...     project_subscriber)
+    <StructuralSubscription at ...>
+    >>> logout()
+    >>> from zope.security.proxy import removeSecurityProxy
+    >>> subscriber_name = removeSecurityProxy(project_subscriber).name
+    >>> anon_browser.open(
+    ...     'http://bugs.launchpad.dev/~%s/+patches' % subscriber_name)
+    >>> show_patches_view(anon_browser.contents)
+    Bug                  Importance  Status        Project          Patch Age
+    Bug #20: bug_e is... Medium      Triaged     evolution        ...second...
+    From: Patchy Person
+    Link: patch_h.diff
+    patch h is for helping
+    Bug #18: bug_c title Wishlist  Fix Committed patchy-product-1 ...second...
+    From: Patchy Person
+    Link: patch_f.diff
+    description of patch f
+    Bug #17: bug_b title Critical  Confirmed     patchy-product-1 ...second...
+    From: Patchy Person
+    Link: patch_c.diff
+    description of patch c
+    Bug #16: bug_a title Undecided New           patchy-product-1 ...second...
+    From: Patchy Person
+    Link: patch_a.diff
+    description of patch a
+
 Reaching the Patches View
 -------------------------
 
@@ -496,24 +590,28 @@
 
     >>> print_bugfilters_portlet_filled(anon_browser, 'ubuntu')
     6 New bugs
-    9 Open bugs
+    10 Open bugs
     0 In-progress bugs
     0 Critical bugs
     1 High importance bug
     0 Incomplete bugs (can expire)
     <BLANKLINE>
-    5 Bugs with patches
+    6 Bugs with patches
     2 Bugs fixed elsewhere
     2 Open CVE bugs - CVE reports
 
 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.
+bugs too.  N.B. only 5 bug tasks will appear at a time.
 
     >>> anon_browser.open('http://bugs.launchpad.dev/ubuntu/+patches')
     >>> show_patches_view(anon_browser.contents)
     Bug                        Importance    Status    Package    Patch Age
+    Bug #20: bug_e...            Medium      Triaged   evolution  ...second...
+    From: Patchy Person
+    Link: patch_h.diff
+    patch h is for helping
     Bug #18: bug_c title          High       Triaged   a52dec     ...second...
     From: Patchy Person
     Link: patch_f.diff
@@ -530,7 +628,3 @@
     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/structural-subscriptions/xx-bug-subscriptions.txt'
--- lib/lp/bugs/stories/structural-subscriptions/xx-bug-subscriptions.txt	2009-10-28 18:00:36 +0000
+++ lib/lp/bugs/stories/structural-subscriptions/xx-bug-subscriptions.txt	2010-06-07 18:13:25 +0000
@@ -64,7 +64,7 @@
         Landscape Developers
 
 
-== Additional options for distribuion drivers ==
+== Additional options for distribution drivers ==
 
 When editing the subscriptions for a package, a distribution driver
 can subscribe any Launchpad user.

=== modified file 'lib/lp/bugs/stories/webservice/xx-bug.txt'
--- lib/lp/bugs/stories/webservice/xx-bug.txt	2010-05-18 12:38:19 +0000
+++ lib/lp/bugs/stories/webservice/xx-bug.txt	2010-06-07 18:13:25 +0000
@@ -1660,7 +1660,7 @@
     owner_link: u'http://api.launchpad.dev/beta/~testuser1'
     ...
 
-`testuser2` is subscribed to `testbugs2`, so this bug is related to this
+`testuser2` is subscribed to `testbug2`, so this bug is related to this
 user:
 
     >>> related = webservice.named_get(
@@ -1682,15 +1682,16 @@
     total_size: 0
     ---
 
-You are not allowed to overwrite all user related parameter in the same
-query, because in this case this bug will no be related to the person
-anymore. In this case a `400 Bad Request`-Error will be returned
+You are not allowed to overwrite all user related parameters in the same
+query, because this bug will not be related to the person anymore. In this
+case a `400 Bad Request`-Error will be returned.
 
     >>> name12 = webservice.get("/~name12").jsonBody()
     >>> print webservice.named_get(
     ...     '/~name16', 'searchTasks', assignee=name12['self_link'],
     ...     owner=name12['self_link'], bug_subscriber=name12['self_link'],
-    ...     bug_commenter=name12['self_link']
+    ...     bug_commenter=name12['self_link'],
+    ...     structural_subscriber=name12['self_link']
     ...     )
     HTTP/1.1 400 Bad Request...
 

=== modified file 'lib/lp/registry/tests/test_person.py'
--- lib/lp/registry/tests/test_person.py	2010-05-07 19:07:28 +0000
+++ lib/lp/registry/tests/test_person.py	2010-06-07 18:13:25 +0000
@@ -526,7 +526,8 @@
 
     def checkUserFields(
         self, params, assignee=None, bug_subscriber=None,
-        owner=None, bug_commenter=None, bug_reporter=None):
+        owner=None, bug_commenter=None, bug_reporter=None,
+        structural_subscriber=None):
         self.failUnlessEqual(assignee, params.assignee)
         # fromSearchForm() takes a bug_subscriber parameter, but saves
         # it as subscriber on the parameter object.
@@ -534,14 +535,15 @@
         self.failUnlessEqual(owner, params.owner)
         self.failUnlessEqual(bug_commenter, params.bug_commenter)
         self.failUnlessEqual(bug_reporter, params.bug_reporter)
+        self.failUnlessEqual(structural_subscriber, params.structural_subscriber)
 
     def test_get_related_bugtasks_search_params(self):
         # With no specified options, get_related_bugtasks_search_params()
-        # returns 4 BugTaskSearchParams objects, each with a different
+        # returns 5 BugTaskSearchParams objects, each with a different
         # user field set.
         search_params = get_related_bugtasks_search_params(
             self.user, self.context)
-        self.assertEqual(len(search_params), 4)
+        self.assertEqual(len(search_params), 5)
         self.checkUserFields(
             search_params[0], assignee=self.context)
         self.checkUserFields(
@@ -550,13 +552,15 @@
             search_params[2], owner=self.context, bug_reporter=self.context)
         self.checkUserFields(
             search_params[3], bug_commenter=self.context)
+        self.checkUserFields(
+            search_params[4], structural_subscriber=self.context)
 
     def test_get_related_bugtasks_search_params_with_assignee(self):
         # With assignee specified, get_related_bugtasks_search_params()
-        # returns 3 BugTaskSearchParams objects.
+        # returns 4 BugTaskSearchParams objects.
         search_params = get_related_bugtasks_search_params(
             self.user, self.context, assignee=self.user)
-        self.assertEqual(len(search_params), 3)
+        self.assertEqual(len(search_params), 4)
         self.checkUserFields(
             search_params[0], assignee=self.user, bug_subscriber=self.context)
         self.checkUserFields(
@@ -564,19 +568,23 @@
             bug_reporter=self.context)
         self.checkUserFields(
             search_params[2], assignee=self.user, bug_commenter=self.context)
+        self.checkUserFields(
+            search_params[3], assignee=self.user, structural_subscriber=self.context)
 
     def test_get_related_bugtasks_search_params_with_owner(self):
         # With owner specified, get_related_bugtasks_search_params() returns
-        # 3 BugTaskSearchParams objects.
+        # 4 BugTaskSearchParams objects.
         search_params = get_related_bugtasks_search_params(
             self.user, self.context, owner=self.user)
-        self.assertEqual(len(search_params), 3)
+        self.assertEqual(len(search_params), 4)
         self.checkUserFields(
             search_params[0], owner=self.user, assignee=self.context)
         self.checkUserFields(
             search_params[1], owner=self.user, bug_subscriber=self.context)
         self.checkUserFields(
             search_params[2], owner=self.user, bug_commenter=self.context)
+        self.checkUserFields(
+            search_params[3], owner=self.user, structural_subscriber=self.context)
 
     def test_get_related_bugtasks_search_params_with_bug_reporter(self):
         # With bug reporter specified, get_related_bugtasks_search_params()
@@ -584,7 +592,7 @@
         # is overwritten in one instance.
         search_params = get_related_bugtasks_search_params(
             self.user, self.context, bug_reporter=self.user)
-        self.assertEqual(len(search_params), 4)
+        self.assertEqual(len(search_params), 5)
         self.checkUserFields(
             search_params[0], bug_reporter=self.user,
             assignee=self.context)
@@ -599,13 +607,16 @@
         self.checkUserFields(
             search_params[3], bug_reporter=self.user,
             bug_commenter=self.context)
+        self.checkUserFields(
+            search_params[4], bug_reporter=self.user,
+            structural_subscriber=self.context)
 
     def test_get_related_bugtasks_search_params_illegal(self):
         self.assertRaises(
             IllegalRelatedBugTasksParams,
             get_related_bugtasks_search_params, self.user, self.context,
             assignee=self.user, owner=self.user, bug_commenter=self.user,
-            bug_subscriber=self.user)
+            bug_subscriber=self.user, structural_subscriber=self.user)
 
     def test_get_related_bugtasks_search_params_illegal_context(self):
         # in case the `context` argument is not  of type IPerson an