Merge lp:~intellectronica/launchpad/max-heat-from-context into lp:launchpad/db-devel

[Eleanor Berger]

This branch changes the way we compare a bug's heat to max_bug_heat in listings. Instead of always comparing to the max_heat of the bugtask's target, we compare it to the max_heat of the context currently being viewed. This is important when looking at the bug listing for a distribution or a project group, because in those cases the bugtasks being displayed may have a target that is different from the one being viewed (like a product in a project listing, or a package in a distro listing).

[Eleanor Berger (intellectronica)]

=== 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-04 11:24:09 +0000
@@ -1103,9 +1103,11 @@
         return min(heat_index, 4)

-def bugtask_heat_html(bugtask):
+def bugtask_heat_html(bugtask, target=None):
     """Render the HTML representing bug heat for a given bugask."""
- max_bug_heat = bugtask.target.max_bug_heat
+ if target is None:
+ target = bugtask.target
+ max_bug_heat = target.max_bug_heat
     if max_bug_heat is None:
         max_bug_heat = 5000
     heat_ratio = calculate_heat_display(bugtask.bug.heat, max_bug_heat)
@@ -1979,7 +1981,8 @@
     delegates(IBugTask, 'bugtask')

     def __init__(self, bugtask, has_mentoring_offer, has_bug_branch,
- has_specification, has_patch, request=None):
+ has_specification, has_patch, request=None,
+ target_context=None):
         self.bugtask = bugtask
         self.review_action_widget = None
         self.has_mentoring_offer = has_mentoring_offer
@@ -1987,6 +1990,7 @@
         self.has_specification = has_specification
         self.has_patch = has_patch
         self.request = request
+ self.target_context = target_context

     @property
     def last_significant_change_date(self):
@@ -1998,7 +2002,7 @@
     @property
     def bug_heat_html(self):
         """Returns the bug heat flames HTML."""
- return bugtask_heat_html(self.bugtask)
+ return bugtask_heat_html(self.bugtask, target=self.target_context)

 class BugListingBatchNavigator(TableBatchNavigator):
@@ -2006,8 +2010,10 @@
     # XXX sinzui 2009-05-29 bug=381672: Extract the BugTaskListingItem rules
     # to a mixin so that MilestoneView and others can use it.

- def __init__(self, tasks, request, columns_to_show, size):
+ def __init__(self, tasks, request, columns_to_show, size,
+ target_context=None):
         self.request = request
+ self.target_context = target_context
         TableBatchNavigator.__init__(
             self, tasks, request, columns_to_show=columns_to_show, size=size)

@@ -2025,7 +2031,8 @@
             badge_property['has_branch'],
             badge_property['has_specification'],
             badge_property['has_patch'],
- request=self.request)
+ request=self.request,
+ target_context=self.target_context)

     def getBugListingItems(self):
         """Return a decorated list of visible bug tasks."""
@@ -2428,7 +2435,8 @@
         """Return the batch navigator to be used to batch the bugtasks."""
         return BugListingBatchNavigator(
             tasks, self.request, columns_to_show=self.columns_to_show,
- size=config.malone.buglist_batch_size)
+ size=config.malone.buglist_batch_size,
+ target_context=self.context)

     def buildBugTaskSearchParams(self, searchtext=None, extra_params=None):
         """Build the parameters to submit to the `searchTasks` method.

=== modified file 'lib/lp/bugs/browser/tests/bug-heat-view.txt'
--- lib/lp/bugs/browser/tests/bug-heat-view.txt 2010-02-26 15:36:58 +0000
+++ lib/lp/bug...

[Abel Deuring (adeuring)]

review: Approve (code)

[Francis J. Lacoste (flacoste)]

Land it on db-devel

review: Approve (release-critical)

[lp:~intellectronica/launchpad/max-heat-from-context]

9076. By Eleanor Berger on 2010-03-05

Don't use target_context for calculating bug heat if the context is IPerson or IMaloneApplication - they don't have a max_bug_heat attribute.

9077. By Eleanor Berger on 2010-03-08

merge changes from devel

9078. By Eleanor Berger on 2010-03-08

merge changes from devel

=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py	2010-02-24 23:02:56 +0000
+++ lib/canonical/launchpad/security.py	2010-03-08 20:45:41 +0000
@@ -2106,19 +2106,13 @@
         return user.in_admin
 
 
-class ViewSourcePackagePublishingHistory(AuthorizationBase):
+class ViewSourcePackagePublishingHistory(ViewArchive):
     """Restrict viewing of source publications."""
     permission = "launchpad.View"
     usedfor = ISourcePackagePublishingHistory
 
-    def checkAuthenticated(self, user):
-        view_archive = ViewArchive(self.obj.archive)
-        if view_archive.checkAuthenticated(user):
-            return True
-        return user.in_admin
-
-    def checkUnauthenticated(self):
-        return not self.obj.archive.private
+    def __init__(self, obj):
+        super(ViewSourcePackagePublishingHistory, self).__init__(obj.archive)
 
 
 class EditPublishing(AuthorizationBase):

=== 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 20:45:41 +0000
@@ -114,9 +114,10 @@
     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.bugs.interfaces.malone import IMaloneApplication
 from lp.registry.interfaces.distribution import IDistribution
 from lp.registry.interfaces.distributionsourcepackage import (
     IDistributionSourcePackage)
@@ -1103,9 +1104,11 @@
         return min(heat_index, 4)
 
 
-def bugtask_heat_html(bugtask):
+def bugtask_heat_html(bugtask, target=None):
     """Render the HTML representing bug heat for a given bugask."""
-    max_bug_heat = bugtask.target.max_bug_heat
+    if target is None:
+        target = bugtask.target
+    max_bug_heat = target.max_bug_heat
     if max_bug_heat is None:
         max_bug_heat = 5000
     heat_ratio = calculate_heat_display(bugtask.bug.heat, max_bug_heat)
@@ -1886,7 +1889,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()
 
 
@@ -1979,7 +1982,8 @@
     delegates(IBugTask, 'bugtask')
 
     def __init__(self, bugtask, has_mentoring_offer, has_bug_branch,
-                 has_specification, has_patch, request=None):
+                 has_specification, has_patch, request=None,
+                 target_context=None):
         self.bugtask = bugtask
         self.review_action_widget = None
         self.has_mentoring_offer = has_mentoring_offer
@@ -1987,6 +1991,7 @@
         self.has_specification = has_specification
         self.has_patch = has_patch
         self.request = request
+        self.target_context = target_context
 
     @property
     def last_significant_change_date(self):
@@ -1998,7 +2003,7 @@
     @property
     def bug_heat_html(self):
         """Returns the bug heat flames HTML."""
-        return bugtask_heat_html(self.bugtask)
+        return bugtask_heat_html(self.bugtask, target=self.target_context)
 
 
 class BugListingBatchNavigator(TableBatchNavigator):
@@ -2006,8 +2011,10 @@
     # XXX sinzui 2009-05-29 bug=381672: Extract the BugTaskListingItem rules
     # to a mixin so that MilestoneView and others can use it.
 
-    def __init__(self, tasks, request, columns_to_show, size):
+    def __init__(self, tasks, request, columns_to_show, size,
+                 target_context=None):
         self.request = request
+        self.target_context = target_context
         TableBatchNavigator.__init__(
             self, tasks, request, columns_to_show=columns_to_show, size=size)
 
@@ -2019,13 +2026,22 @@
     def _getListingItem(self, bugtask):
         """Return a decorated bugtask for the bug listing."""
         badge_property = self.bug_badge_properties[bugtask]
+        if (IMaloneApplication.providedBy(self.target_context) or
+            IPerson.providedBy(self.target_context)):
+            # XXX Tom Berger bug=529846
+            # When we have a specific interface for things that have bug heat
+            # it would be better to use that for the check here instead.
+            target_context = None
+        else:
+            target_context = self.target_context
         return BugTaskListingItem(
             bugtask,
             badge_property['has_mentoring_offer'],
             badge_property['has_branch'],
             badge_property['has_specification'],
             badge_property['has_patch'],
-            request=self.request)
+            request=self.request,
+            target_context=target_context)
 
     def getBugListingItems(self):
         """Return a decorated list of visible bug tasks."""
@@ -2428,7 +2444,8 @@
         """Return the batch navigator to be used to batch the bugtasks."""
         return BugListingBatchNavigator(
             tasks, self.request, columns_to_show=self.columns_to_show,
-            size=config.malone.buglist_batch_size)
+            size=config.malone.buglist_batch_size,
+            target_context=self.context)
 
     def buildBugTaskSearchParams(self, searchtext=None, extra_params=None):
         """Build the parameters to submit to the `searchTasks` method.

=== modified file 'lib/lp/bugs/browser/tests/bug-heat-view.txt'
--- lib/lp/bugs/browser/tests/bug-heat-view.txt	2010-02-26 15:36:58 +0000
+++ lib/lp/bugs/browser/tests/bug-heat-view.txt	2010-03-08 20:45:41 +0000
@@ -9,8 +9,8 @@
     >>> from zope.security.proxy import removeSecurityProxy
     >>> from BeautifulSoup import BeautifulSoup
     >>> from lp.bugs.browser.bugtask import bugtask_heat_html
-    >>> def print_flames(bugtask):
-    ...     html = bugtask_heat_html(bugtask)
+    >>> def print_flames(bugtask, target=None):
+    ...     html = bugtask_heat_html(bugtask, target=target)
     ...     soup = BeautifulSoup(html)
     ...     for img in soup.span.contents:
     ...         print img['src']
@@ -46,6 +46,31 @@
     0 out of 4 heat flames
     Heat: 500
 
+
+== Specifying the target ==
+
+Some bugs can be viewed in a context different from their task's target. For
+example, bugs with tasks on packages can be viewed in the context of the entire
+distribution. In such cases, we want to explicitly specify the target, rather
+than use the bugtask's. We can do that by passing the target as a keyword
+parameter.
+
+    >>> bug = factory.makeBug()
+    >>> distro = factory.makeDistribution()
+    >>> dsp = factory.makeDistributionSourcePackage(distribution=distro)
+    >>> dsp_task = bug.addTask(bug.owner, dsp)
+    >>> removeSecurityProxy(distro).max_bug_heat = MAX_HEAT
+    >>> removeSecurityProxy(dsp).max_bug_heat = MAX_HEAT / 2
+    >>> removeSecurityProxy(bug).heat = MAX_HEAT / 4
+    >>> print_flames(dsp_task)
+    /@@/bug-heat-2.png
+    2 out of 4 heat flames
+    Heat: 1250
+    >>> print_flames(dsp_task, target=distro)
+    /@@/bug-heat-0.png
+    0 out of 4 heat flames
+    Heat: 1250
+
     >>> logout()
 
 

=== 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 20:45:41 +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())

=== modified file 'lib/lp/bugs/interfaces/bug.py'
--- lib/lp/bugs/interfaces/bug.py	2010-03-04 14:01:27 +0000
+++ lib/lp/bugs/interfaces/bug.py	2010-03-08 20:45:41 +0000
@@ -37,6 +37,7 @@
 from lp.bugs.interfaces.bugtask import (
     BugTaskImportance, BugTaskStatus, IBugTask)
 from lp.bugs.interfaces.bugwatch import IBugWatch
+from lp.bugs.interfaces.bugbranch import IBugBranch
 from lp.bugs.interfaces.cve import ICve
 from canonical.launchpad.interfaces.launchpad import  IPrivacy, NotFoundError
 from canonical.launchpad.interfaces.message import IMessage
@@ -251,9 +252,12 @@
             readonly=True))
     questions = Attribute("List of questions related to this bug.")
     specifications = Attribute("List of related specifications.")
-    linked_branches = Attribute(
-        "Branches associated with this bug, usually "
-        "branches on which this bug is being fixed.")
+    linked_branches = exported(
+        CollectionField(
+            title=_("Branches associated with this bug, usually "
+            "branches on which this bug is being fixed."),
+            value_type=Reference(schema=IBugBranch),
+            readonly=True))
     tags = exported(
         List(title=_("Tags"), description=_("Separated by whitespace."),
              value_type=Tag(), required=False))

=== modified file 'lib/lp/bugs/stories/webservice/xx-bug.txt'
--- lib/lp/bugs/stories/webservice/xx-bug.txt	2010-02-27 20:20:03 +0000
+++ lib/lp/bugs/stories/webservice/xx-bug.txt	2010-03-08 20:45:41 +0000
@@ -33,6 +33,7 @@
   heat: 0
   id: 11
   latest_patch_uploaded: None
+  linked_branches_collection_link: u'http://.../bugs/11/linked_branches'
   messages_collection_link: u'http://.../bugs/11/messages'
   name: None
   number_of_duplicates: 0
@@ -1965,3 +1966,35 @@
     >>> for submission in linked_submissions['entries']:
     ...     print submission['submission_key']
     private-submission
+
+Bug branches
+------------
+
+For every bug we can look at the branches linked to it.
+
+    >>> bug_four = webservice.get("/bugs/4").jsonBody()
+    >>> bug_four_branches_url = bug_four['linked_branches_collection_link']
+    >>> bug_four_branches = webservice.get(bug_four_branches_url).jsonBody()
+    >>> pprint_collection(bug_four_branches)
+    resource_type_link: u'http://.../#bug_branch-page-resource'
+    start: 0
+    total_size: 2
+    ---
+    branch_link: u'http://.../~mark/firefox/release-0.9.2'
+    bug_link: u'http://.../bugs/4'
+    resource_type_link: u'http://.../#bug_branch'
+    self_link: u'http://.../~mark/firefox/release-0.9.2/+bug/4'
+    ---
+    branch_link: u'http://.../~name12/firefox/main'
+    bug_link: u'http://.../bugs/4'
+    resource_type_link: u'http://.../beta/#bug_branch'
+    self_link: u'http://.../~name12/firefox/main/+bug/4'
+    ---
+
+For every branch we can also look at the bugs linked to it.
+
+    >>> branch_entry = bug_four_branches['entries'][0]
+    >>> bug_link = webservice.get(
+    ...     branch_entry['bug_link']).jsonBody()
+    >>> print bug_link['self_link']
+    http://.../bugs/4

=== modified file 'lib/lp/buildmaster/interfaces/buildbase.py'
--- lib/lp/buildmaster/interfaces/buildbase.py	2010-02-16 03:52:28 +0000
+++ lib/lp/buildmaster/interfaces/buildbase.py	2010-03-08 20:45:41 +0000
@@ -7,7 +7,7 @@
 
 __metaclass__ = type
 
-__all__ = ['IBuildBase']
+__all__ = ['BUILDD_MANAGER_LOG_NAME', 'IBuildBase']
 
 from zope.interface import Attribute, Interface
 from zope.schema import Choice, Datetime, Object, TextLine, Timedelta
@@ -24,6 +24,9 @@
 from canonical.launchpad import _
 
 
+BUILDD_MANAGER_LOG_NAME = "slave-scanner"
+
+
 class IBuildBase(Interface):
     """Common interface shared by farm jobs that build a package."""
 

=== modified file 'lib/lp/buildmaster/manager.py'
--- lib/lp/buildmaster/manager.py	2010-02-02 16:39:10 +0000
+++ lib/lp/buildmaster/manager.py	2010-03-08 20:45:41 +0000
@@ -31,7 +31,7 @@
 from canonical.launchpad.webapp import urlappend
 from canonical.librarian.db import write_transaction
 from canonical.twistedsupport.processmonitor import run_process_with_timeout
-
+from lp.buildmaster.interfaces.buildbase import BUILDD_MANAGER_LOG_NAME
 
 buildd_success_result_map = {
     'ensurepresent': True,
@@ -222,7 +222,7 @@
         Make it less verbose to avoid messing too much with the old code.
         """
         level = logging.INFO
-        logger = logging.getLogger('slave-scanner')
+        logger = logging.getLogger(BUILDD_MANAGER_LOG_NAME)
 
         # Redirect the output to the twisted log module.
         channel = logging.StreamHandler(log.StdioOnnaStick())
@@ -283,7 +283,7 @@
 
             Perform the finishing-cycle tasks mentioned above.
             """
-            self.logger.info('Scanning cycle finished.')
+            self.logger.debug('Scanning cycle finished.')
             # We are only interested in returned objects of type
             # BaseDispatchResults, those are the ones that needs evaluation.
             # None, resulting from successful chains, are discarded.
@@ -304,7 +304,7 @@
             # Return the evaluated events for testing purpose.
             return deferred_results
 
-        self.logger.info('Finishing scanning cycle.')
+        self.logger.debug('Finishing scanning cycle.')
         dl = defer.DeferredList(self._deferreds, consumeErrors=True)
         dl.addBoth(done)
         return dl
@@ -415,7 +415,7 @@
 
         See `RecordingSlave.resumeSlaveHost` for more details.
         """
-        self.logger.info('Resuming slaves: %s' % recording_slaves)
+        self.logger.debug('Resuming slaves: %s' % recording_slaves)
         self.remaining_slaves = recording_slaves
         if len(self.remaining_slaves) == 0:
             self.finishCycle()

=== modified file 'lib/lp/buildmaster/master.py'
--- lib/lp/buildmaster/master.py	2010-01-20 01:23:38 +0000
+++ lib/lp/buildmaster/master.py	2010-03-08 20:45:41 +0000
@@ -138,7 +138,7 @@
         self._tm = tm
         self.librarian = getUtility(ILibrarianClient)
         self._archseries = {}
-        self._logger.info("Buildd Master has been initialised")
+        self._logger.debug("Buildd Master has been initialised")
 
     def commit(self):
         self._tm.commit()

=== modified file 'lib/lp/buildmaster/model/buildbase.py'
--- lib/lp/buildmaster/model/buildbase.py	2010-03-05 23:29:50 +0000
+++ lib/lp/buildmaster/model/buildbase.py	2010-03-08 20:45:41 +0000
@@ -29,6 +29,7 @@
 from canonical.launchpad.helpers import filenameToContentType
 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
 from canonical.librarian.utils import copy_and_close
+from lp.buildmaster.interfaces.buildbase import BUILDD_MANAGER_LOG_NAME
 from lp.registry.interfaces.pocket import pocketsuffix
 from lp.soyuz.interfaces.build import BuildStatus
 from lp.soyuz.model.buildqueue import BuildQueue
@@ -129,7 +130,7 @@
 
     def handleStatus(self, status, librarian, slave_status):
         """See `IBuildBase`."""
-        logger = logging.getLogger()
+        logger = logging.getLogger(BUILDD_MANAGER_LOG_NAME)
 
         method = getattr(self, '_handleStatus_' + status, None)
 
@@ -151,7 +152,8 @@
         buildid = slave_status['build_id']
         filemap = slave_status['filemap']
 
-        logger.debug("Processing successful build %s" % buildid)
+        logger.info("Processing successful build %s from builder %s" % (
+            buildid, self.buildqueue_record.builder.name))
         # Explode before collect a binary that is denied in this
         # distroseries/pocket
         if not self.archive.allowUpdatesToReleasePocket():
@@ -180,6 +182,7 @@
 
         slave = removeSecurityProxy(self.buildqueue_record.builder.slave)
         for filename in filemap:
+            logger.info("Grabbing file: %s" % filename)
             slave_file = slave.getFile(filemap[filename])
             out_file_name = os.path.join(upload_path, filename)
             out_file = open(out_file_name, "wb")
@@ -190,8 +193,8 @@
             upload_leaf, uploader_logfilename)
         logger.debug("Saving uploader log at '%s'" % uploader_logfilename)
 
-        logger.debug("Invoking uploader on %s" % root)
-        logger.debug("%s" % uploader_command)
+        logger.info("Invoking uploader on %s" % root)
+        logger.info("%s" % uploader_command)
 
         uploader_process = subprocess.Popen(
             uploader_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -204,11 +207,11 @@
         # when it failed HARD (there is a huge effort in process-upload
         # to not return error, it only happen when the code is broken).
         uploader_result_code = uploader_process.returncode
-        logger.debug("Uploader returned %d" % uploader_result_code)
+        logger.info("Uploader returned %d" % uploader_result_code)
 
         # Quick and dirty hack to carry on on process-upload failures
         if os.path.exists(upload_dir):
-            logger.debug("The upload directory did not get moved.")
+            logger.warning("The upload directory did not get moved.")
             failed_dir = os.path.join(root, "failed-to-move")
             if not os.path.exists(failed_dir):
                 os.mkdir(failed_dir)
@@ -261,7 +264,7 @@
         # binary upload when it was the case.
         if (self.buildstate != BuildStatus.FULLYBUILT or
             not self.verifySuccessfulUpload()):
-            logger.debug("Build %s upload failed." % self.id)
+            logger.warning("Build %s upload failed." % self.id)
             self.buildstate = BuildStatus.FAILEDTOUPLOAD
             uploader_log_content = self.getUploadLogContent(root,
                 upload_leaf)
@@ -271,7 +274,7 @@
             # Notify the build failure.
             self.notify(extra_info=uploader_log_content)
         else:
-            logger.debug(
+            logger.info(
                 "Gathered %s %d completely" % (
                 self.__class__.__name__, self.id))
 

=== modified file 'lib/lp/buildmaster/model/builder.py'
--- lib/lp/buildmaster/model/builder.py	2010-01-22 04:01:17 +0000
+++ lib/lp/buildmaster/model/builder.py	2010-03-08 20:45:41 +0000
@@ -636,17 +636,17 @@
 
     def pollBuilders(self, logger, txn):
         """See IBuilderSet."""
-        logger.info("Slave Scan Process Initiated.")
+        logger.debug("Slave Scan Process Initiated.")
 
         buildMaster = BuilddMaster(logger, txn)
 
-        logger.info("Setting Builders.")
+        logger.debug("Setting Builders.")
         # Put every distroarchseries we can find into the build master.
         for archseries in getUtility(IDistroArchSeriesSet):
             buildMaster.addDistroArchSeries(archseries)
             buildMaster.setupBuilders(archseries)
 
-        logger.info("Scanning Builders.")
+        logger.debug("Scanning Builders.")
         # Scan all the pending builds, update logtails and retrieve
         # builds where they are completed
         buildMaster.scanActiveBuilders()

=== modified file 'lib/lp/registry/model/distributionsourcepackage.py'
--- lib/lp/registry/model/distributionsourcepackage.py	2010-03-05 20:14:29 +0000
+++ lib/lp/registry/model/distributionsourcepackage.py	2010-03-08 20:45:41 +0000
@@ -283,6 +283,7 @@
         results = store.find(
             Archive,
             Archive.distribution == self.distribution,
+            Archive._enabled == True,
             Archive.private == False,
             SourcePackagePublishingHistory.archive == Archive.id,
             (SourcePackagePublishingHistory.status ==

=== modified file 'lib/lp/registry/stories/distribution/xx-distribution-packages.txt'
--- lib/lp/registry/stories/distribution/xx-distribution-packages.txt	2010-03-06 21:05:16 +0000
+++ lib/lp/registry/stories/distribution/xx-distribution-packages.txt	2010-03-08 20:45:41 +0000
@@ -145,7 +145,18 @@
     >>> ppa_beta = factory.makeArchive(name="beta",
     ...                                distribution=ubuntutest)
 
-    # Then publish netapplet to both PPAs
+The 'ppa_disabled' archive added below will be disabled at the end of this
+set-up block. 
+It will thus not be listed in the "...other untrusted versions of..." portlet.
+
+    >>> ppa_disabled = factory.makeArchive(name="disabled",
+    ...                                    distribution=ubuntutest)
+
+    # Then publish netapplet to all PPAs
+    >>> netapplet_disabled_pub_breezy = publisher.getPubSource(
+    ...     sourcename="netapplet", archive=ppa_disabled,
+    ...     creator=ppa_disabled.owner,
+    ...     status=PackagePublishingStatus.PUBLISHED, version='0.8.1d1')
     >>> netapplet_nightly_pub_breezy = publisher.getPubSource(
     ...     sourcename="netapplet", archive=ppa_nightly,
     ...     creator=ppa_nightly.owner,
@@ -165,6 +176,8 @@
     >>> from lp.registry.model.karma import KarmaTotalCache
     >>> ppa_beta_owner_id = ppa_beta.owner.id
     >>> ppa_nightly_owner_id = ppa_nightly.owner.id
+    >>> ppa_disabled_owner_id = ppa_disabled.owner.id
+    >>> ppa_disabled.disable()
     >>> transaction.commit()
 
     # XXX: Michael Nelson 2009-07-07 bug=396419. Currently there is no
@@ -178,12 +191,13 @@
     ...     person=ppa_beta_owner_id, karma_total=200)
     >>> cache_entry = KarmaTotalCache(
     ...     person=ppa_nightly_owner_id, karma_total=201)
+    >>> cache_entry = KarmaTotalCache(
+    ...     person=ppa_disabled_owner_id, karma_total=202)
     >>> transaction.commit()
     >>> reconnect_stores('launchpad')
 
     >>> logout()
 
-
 A /$DISTRO/+source/$PACKAGE page shows an overview of a source package in
 a distribution.  There are several sections of information.
 

=== modified file 'lib/lp/soyuz/browser/archivesubscription.py'
--- lib/lp/soyuz/browser/archivesubscription.py	2009-09-29 07:21:40 +0000
+++ lib/lp/soyuz/browser/archivesubscription.py	2010-03-08 20:45:41 +0000
@@ -298,12 +298,26 @@
             self.context)
 
         # Turn the result set into a list of dicts so it can be easily
-        # accessed in TAL:
-        return [
-            dict(subscription=PersonalArchiveSubscription(self.context,
-                                                          subscr.archive),
-                 token=token)
-            for subscr, token in subs_with_tokens]
+        # accessed in TAL. Note that we need to ensure that only one
+        # PersonalArchiveSubscription is included for each archive,
+        # as the person might have participation in multiple
+        # subscriptions (via different teams).
+        unique_archives = set()
+        personal_subscription_tokens = []
+        for subscription, token in subs_with_tokens:
+            if subscription.archive in unique_archives:
+                continue
+
+            unique_archives.add(subscription.archive)
+
+            personal_subscription = PersonalArchiveSubscription(
+                self.context, subscription.archive)
+            personal_subscription_tokens.append({
+                'subscription': personal_subscription,
+                'token': token
+                })
+
+        return personal_subscription_tokens
 
 
 class PersonArchiveSubscriptionView(LaunchpadView):

=== modified file 'lib/lp/soyuz/doc/buildd-slavescanner.txt'
--- lib/lp/soyuz/doc/buildd-slavescanner.txt	2010-02-27 21:18:10 +0000
+++ lib/lp/soyuz/doc/buildd-slavescanner.txt	2010-03-08 20:45:41 +0000
@@ -285,7 +285,7 @@
 
     >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem4)
     >>> a_builder.updateBuild(bqItem4)
-    CRITICAL:root:***** bob is MANUALDEPWAIT *****
+    CRITICAL:slave-scanner:***** bob is MANUALDEPWAIT *****
     >>> build.builder is not None
     True
     >>> build.datebuilt is not None
@@ -314,7 +314,7 @@
     ...     WaitingSlave('BuildStatus.CHROOTFAIL'))
     >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem5)
     >>> a_builder.updateBuild(bqItem5)
-    CRITICAL:root:***** bob is CHROOTWAIT *****
+    CRITICAL:slave-scanner:***** bob is CHROOTWAIT *****
     >>> build.builder is not None
     True
     >>> build.datebuilt is not None
@@ -340,7 +340,7 @@
     ...     WaitingSlave('BuildStatus.BUILDERFAIL'))
 
     >>> a_builder.updateBuild(bqItem6)
-    WARNING:root:***** bob has failed *****
+    WARNING:slave-scanner:***** bob has failed *****
 
     >>> from canonical.launchpad.ftests import sync
     >>> sync(a_builder)
@@ -460,6 +460,7 @@
 
     >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem10)
     >>> a_builder.updateBuild(bqItem10)
+    WARNING:slave-scanner:Build ... upload failed.
     >>> build.builder is not None
     True
     >>> build.datebuilt is not None
@@ -583,7 +584,7 @@
     >>> bqItem11.builder.setSlaveForTesting(
     ...     WaitingSlave('BuildStatus.GIVENBACK'))
     >>> a_builder.updateBuild(bqItem11)
-    WARNING:root:***** 1-1 is GIVENBACK by bob *****
+    WARNING:slave-scanner:***** 1-1 is GIVENBACK by bob *****
 
 Ensure GIVENBACK build preserves the history for future use. (we
 can't be sure if logtail will contain any information, because it
@@ -1261,6 +1262,7 @@
     >>> build.upload_log = None
     >>> candidate.builder.setSlaveForTesting(WaitingSlave('BuildStatus.OK'))
     >>> a_builder.updateBuild(candidate)
+    WARNING:slave-scanner:Build ... upload failed.
     >>> local_transaction.commit()
 
     >>> build.archive.private

=== modified file 'lib/lp/soyuz/model/buildqueue.py'
--- lib/lp/soyuz/model/buildqueue.py	2010-02-22 08:30:06 +0000
+++ lib/lp/soyuz/model/buildqueue.py	2010-03-08 20:45:41 +0000
@@ -223,16 +223,17 @@
 
         head_job_processor, head_job_virtualized = head_job_platform
 
+        now = self._now()
         delay_query = """
             SELECT MIN(
               CASE WHEN
                 EXTRACT(EPOCH FROM
                   (BuildQueue.estimated_duration -
-                   (((now() AT TIME ZONE 'UTC') - Job.date_started))))  >= 0
+                   (((%s AT TIME ZONE 'UTC') - Job.date_started))))  >= 0
               THEN
                 EXTRACT(EPOCH FROM
                   (BuildQueue.estimated_duration -
-                   (((now() AT TIME ZONE 'UTC') - Job.date_started))))
+                   (((%s AT TIME ZONE 'UTC') - Job.date_started))))
               ELSE
                 -- Assume that jobs that have overdrawn their estimated
                 -- duration time budget will complete within 2 minutes.
@@ -253,7 +254,7 @@
                 AND Job.status = %s
                 AND Builder.virtualized = %s
             """ % sqlvalues(
-                JobStatus.RUNNING,
+                now, now, JobStatus.RUNNING,
                 normalize_virtualization(head_job_virtualized))
 
         if head_job_processor is not None:
@@ -460,10 +461,15 @@
 
         # A job will not get dispatched in less than 5 seconds no matter what.
         start_time = max(5, min_wait_time + sum_of_delays)
-        result = datetime.utcnow() + timedelta(seconds=start_time)
+        result = self._now() + timedelta(seconds=start_time)
 
         return result
 
+    @staticmethod
+    def _now():
+        """Provide utcnow() while allowing test code to monkey-patch this."""
+        return datetime.utcnow()
+
 
 class BuildQueueSet(object):
     """Utility to deal with BuildQueue content class."""

=== modified file 'lib/lp/soyuz/stories/ppa/xx-private-ppa-subscriptions.txt'
--- lib/lp/soyuz/stories/ppa/xx-private-ppa-subscriptions.txt	2010-02-24 15:52:53 +0000
+++ lib/lp/soyuz/stories/ppa/xx-private-ppa-subscriptions.txt	2010-03-08 20:45:41 +0000
@@ -70,21 +70,23 @@
     ...     'no-subscribers'))
     No one has access to install software from this PPA.
 
-Create two new users that can be subscribed to archives:
+Create two new users that can be subscribed to archives, and a team:
 
     >>> login('[e-mail]')
     >>> joesmith = factory.makePerson(name="joesmith", displayname="Joe Smith",
     ...     password="test", email="[e-mail]")
+    >>> teamjoe = factory.makeTeam(
+    ...     owner=joesmith, displayname="Team Joe", name='teamjoe')
     >>> bradsmith = factory.makePerson(name="bradsmith", displayname="Brad Smith",
     ...     password="test", email="[e-mail]")
     >>> logout()
 
-People can be subscribed by entering their details into the displayed
-form:
+People and teams can be subscribed by entering their details into the
+displayed form:
 
-    >>> cprov_browser.getControl(name='field.subscriber').value = 'joesmith'
+    >>> cprov_browser.getControl(name='field.subscriber').value = 'teamjoe'
     >>> cprov_browser.getControl(
-    ...     name='field.description').value = "Joe is my friend"
+    ...     name='field.description').value = "Joes friends are my friends"
     >>> cprov_browser.getControl(name="field.actions.add").click()
     >>> cprov_browser.getControl(name='field.subscriber').value = 'bradsmith'
     >>> cprov_browser.getControl(
@@ -100,7 +102,7 @@
     ...     print extract_text(row)
     Name                Expires     Comment
     Brad Smith          2200-08-01  Brad can access for a while.  Edit/Cancel
-    Joe Smith                       Joe is my friend              Edit/Cancel
+    Team Joe                        Joes friends are my friends   Edit/Cancel
 
 
 == Managing a persons' Archive subscriptions ==
@@ -120,8 +122,8 @@
     >>> print extract_text(explanation)
     You do not have any current subscriptions to private archives...
 
-First, create a subscription for Joe Smith to mark's archive also, so that
-Joe has multiple subscriptions:
+First, create a subscription for Joe Smith's team to mark's archive
+so that Joe has multiple subscriptions:
 
     >>> mark_browser = setupBrowser(
     ...     auth="Basic [e-mail]:test")
@@ -144,6 +146,7 @@
     PPA named... (ppa:mark/p3a)      Mark Shuttleworth       View
     PPA named... (ppa:cprov/p3a)     Celso Providelo         View
 
+
 == Confirming a subscription ==
 
 When a person clicks on the view button, the subscription is confirmed
@@ -187,3 +190,23 @@
         to PPA named p3a for Mark Shuttleworth
     This repository is signed ...
 
+Once a person has activated a subscription, being subscribed again via
+another team does not lead to duplicate entries on the person's
+subscriptions page.
+
+    >>> mark_browser.open("http://launchpad.dev/~mark/+archive/p3a")
+    >>> mark_browser.getLink("Manage access").click()
+    >>> mark_browser.getControl(name='field.subscriber').value = 'teamjoe'
+    >>> mark_browser.getControl(
+    ...     name='field.description').value = "Joe's friends are my friends."
+    >>> mark_browser.getControl(name="field.actions.add").click()
+    >>> joe_browser.open(
+    ...     "http://launchpad.dev/~joesmith/+archivesubscriptions")
+    >>> rows = find_tags_by_class(
+    ...     joe_browser.contents, 'archive-subscription-row')
+    >>> for row in rows:
+    ...     print extract_text(row)
+    Archive                                            Owner
+    PPA named p3a for Mark Shuttleworth (ppa:mark/p3a) Mark Shuttleworth View
+    PPA named p3a for Celso Providelo (ppa:cprov/p3a)  Celso Providelo   View
+

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-person-packages.txt'
--- lib/lp/soyuz/stories/soyuz/xx-person-packages.txt	2010-02-28 12:58:52 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-person-packages.txt	2010-03-08 20:45:41 +0000
@@ -398,3 +398,25 @@
     source2 PPA named p3a for No Priv... - Ubuntutest Breezy-autotest 666
         ...ago None - -
 
+Please note also that disabled archives are not viewable by anonymous users.
+
+    >>> def print_archive_package_rows(contents):
+    ...     package_table = find_tag_by_id(
+    ...         anon_browser.contents, 'packages_list')
+    ...     for ppa_row in package_table.findChildren('tr'):
+    ...         print extract_text(ppa_row)
+
+    >>> anon_browser.open("http://launchpad.dev/~cprov/+archive/ppa")
+    >>> print_archive_package_rows(anon_browser)
+    Package     Version     Uploaded by
+    ...
+    pmount      0.1-1       no signer (2007-07-09)
+
+    >>> login("[e-mail]")
+    >>> cprov.archive.disable()
+    >>> flush_database_updates()
+    >>> logout()
+    >>> anon_browser.open("http://launchpad.dev/~cprov/+archive/ppa")
+    Traceback (most recent call last):
+    ...
+    Unauthorized: (..., 'browserDefault', 'launchpad.View')

=== modified file 'lib/lp/soyuz/tests/test_buildqueue.py'
--- lib/lp/soyuz/tests/test_buildqueue.py	2010-02-25 16:34:13 +0000
+++ lib/lp/soyuz/tests/test_buildqueue.py	2010-03-08 20:45:41 +0000
@@ -96,8 +96,12 @@
             queue_entry.lastscore)
 
 
-def check_mintime_to_builder(test, bq, min_time):
+def check_mintime_to_builder(
+    test, bq, min_time, time_stamp=datetime.utcnow()):
     """Test the estimated time until a builder becomes available."""
+    # Monkey-patch BuildQueueSet._now() so it returns a constant time stamp
+    # that's not too far in the future. This avoids spurious test failures.
+    monkey_patch_the_now_property(bq)
     delay = bq._estimateTimeToNextBuilder()
     test.assertTrue(
         delay <= min_time,
@@ -131,8 +135,24 @@
     return builder_data[(getattr(job.processor, 'id', None), job.virtualized)]
 
 
+def monkey_patch_the_now_property(buildqueue):
+    """Patch BuildQueue._now() so it returns a constant time stamp.
+
+    This avoids spurious test failures.
+    """
+    # Use the date/time the job started if available.
+    time_stamp = buildqueue.job.date_started
+    if not time_stamp:
+        time_stamp = datetime.utcnow()
+    buildqueue._now = lambda: time_stamp
+    return time_stamp
+
+
 def check_estimate(test, job, delay_in_seconds):
     """Does the dispatch time estimate match the expectation?"""
+    # Monkey-patch BuildQueueSet._now() so it returns a constant time stamp.
+    # This avoids spurious test failures.
+    time_stamp = monkey_patch_the_now_property(job)
     estimate = job.getEstimatedJobStartTime()
     if delay_in_seconds is None:
         test.assertEquals(
@@ -140,7 +160,7 @@
             "An estimate should not be possible at present but one was "
             "returned (%s) nevertheless." % estimate)
     else:
-        estimate -= datetime.utcnow()
+        estimate -= time_stamp
         test.assertTrue(
             estimate.seconds <= delay_in_seconds,
             "The estimated delay deviates from the expected one (%s > %s)" %
@@ -495,9 +515,7 @@
 class TestMinTimeToNextBuilder(SingleArchBuildsBase):
     """Test estimated time-to-builder with builds targetting a single
     processor."""
-    # XXX Michael Nelson 20100223 bug=525329
-    # This is still failing spuriously.
-    def disabled_test_min_time_to_next_builder(self):
+    def test_min_time_to_next_builder(self):
         """When is the next builder capable of running the job at the head of
         the queue becoming available?"""
         # Test the estimation of the minimum time until a builder becomes
@@ -684,9 +702,7 @@
 
 class TestMinTimeToNextBuilderMulti(MultiArchBuildsBase):
     """Test estimated time-to-builder with builds and multiple processors."""
-    # XXX Michael Nelson 20100223 bug=525329
-    # This is still failing spuriously.
-    def disabled_test_min_time_to_next_builder(self):
+    def test_min_time_to_next_builder(self):
         """When is the next builder capable of running the job at the head of
         the queue becoming available?"""
         # One of four builders for the 'apg' build is immediately available.

=== modified file 'lib/lp/translations/browser/tests/language-views.txt'
--- lib/lp/translations/browser/tests/language-views.txt	2009-12-03 15:14:55 +0000
+++ lib/lp/translations/browser/tests/language-views.txt	2010-03-08 20:45:41 +0000
@@ -93,7 +93,7 @@
     ...     print form_dict['form'], ':', form_dict['examples']
     0 : 1, 21, 31, 41, 51, 61...
     1 : 2, 3, 4, 22, 23, 24...
-    2 : 5, 6, 7, 8, 9, 10...
+    2 : 0, 5, 6, 7, 8, 9...
 
 View LanguageSet
 ------------------

=== modified file 'lib/lp/translations/stories/standalone/xx-language.txt'
--- lib/lp/translations/stories/standalone/xx-language.txt	2009-12-18 20:05:08 +0000
+++ lib/lp/translations/stories/standalone/xx-language.txt	2010-03-08 20:45:41 +0000
@@ -117,7 +117,7 @@
     Plural forms
     Spanish has 2 plural forms:
     Form 0 for 1.
-    Form 1 for 2, 3, 4, 5, 6, 7...
+    Form 1 for 0, 2, 3, 4, 5, 6...
     When ...
 
     >>> translationteams_portlet = find_portlet(

=== modified file 'lib/lp/translations/utilities/doc/pluralforms.txt'
--- lib/lp/translations/utilities/doc/pluralforms.txt	2009-09-16 02:35:32 +0000
+++ lib/lp/translations/utilities/doc/pluralforms.txt	2010-03-08 20:45:41 +0000
@@ -31,4 +31,4 @@
     ...     print form_dict['form'], ":", form_dict['examples']
     0 : [1, 21, 31, 41, 51, 61]
     1 : [2, 3, 4, 22, 23, 24]
-    2 : [5, 6, 7, 8, 9, 10]
+    2 : [0, 5, 6, 7, 8, 9]

=== modified file 'lib/lp/translations/utilities/pluralforms.py'
--- lib/lp/translations/utilities/pluralforms.py	2009-09-16 02:35:32 +0000
+++ lib/lp/translations/utilities/pluralforms.py	2010-03-08 20:45:41 +0000
@@ -19,8 +19,13 @@
     # The max length of the examples list per plural form.
     MAX_EXAMPLES = 6
 
-    for number in range(1, 200):
-        form = expression(number)
+    for number in range(0, 200):
+        try:
+            form = expression(number)
+        except ZeroDivisionError:
+            raise BadPluralExpression(
+                "Zero division error in the plural form expression.")
+
         # Create empty list if this form doesn't have one yet
         forms.setdefault(form, [])
         # If all the plural forms for this language have examples (max. of 6
@@ -29,6 +34,11 @@
             continue
         forms[form].append(number)
 
+    if pluralforms_count != len(forms):
+        raise BadPluralExpression(
+            "Number of recognized plural forms doesn't match the "
+            "expected number of them.")
+
     # Each dict has two keys, 'form' and 'examples', that address the form
     # number index and a list of its examples.
     return [{'form' : form, 'examples' : examples}

=== added file 'lib/lp/translations/utilities/tests/test_pluralforms.py'
--- lib/lp/translations/utilities/tests/test_pluralforms.py	1970-01-01 00:00:00 +0000
+++ lib/lp/translations/utilities/tests/test_pluralforms.py	2010-03-08 20:45:41 +0000
@@ -0,0 +1,59 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+import unittest
+
+from lp.translations.utilities.pluralforms import (
+    BadPluralExpression,
+    make_friendly_plural_forms)
+
+class PluralFormsTest(unittest.TestCase):
+    """Test utilities for handling plural forms."""
+
+    def test_make_friendly_plural_form(self):
+        single_form = make_friendly_plural_forms('0', 1)
+        self.assertEqual(single_form,
+                         [{'examples': [0, 1, 2, 3, 4, 5], 'form': 0}])
+
+        two_forms = make_friendly_plural_forms('n!=1', 2)
+        self.assertEqual(two_forms,
+                         [{'examples': [1], 'form': 0},
+                          {'examples': [0, 2, 3, 4, 5, 6], 'form': 1}])
+
+    def test_make_friendly_plural_form_failures(self):
+        # 'To the degree of' is not accepted.
+        self.assertRaises(BadPluralExpression,
+                          make_friendly_plural_forms, 'n**2', 1)
+
+        # Expressions longer than 500 characters are not accepted.
+        self.assertRaises(BadPluralExpression,
+                          make_friendly_plural_forms, '1'*501, 1)
+
+        # Using arbitrary variable names is not allowed.
+        self.assertRaises(BadPluralExpression,
+                          make_friendly_plural_forms, '(a=1)', 1)
+
+        # If number of actual forms doesn't match requested number.
+        self.assertRaises(BadPluralExpression,
+                          make_friendly_plural_forms, 'n!=1', 3)
+
+        # Dividing by zero doesn't work.
+        self.assertRaises(BadPluralExpression,
+                          make_friendly_plural_forms, '(n/0)', 1)
+
+    def test_make_friendly_plural_form_zero_handling(self):
+        zero_forms = make_friendly_plural_forms('n!=0', 2)
+        self.assertEqual(zero_forms,
+                         [{'examples': [0], 'form': 0},
+                          {'examples': [1, 2, 3, 4, 5, 6], 'form': 1}])
+
+        # Since 'n' can be zero as well, dividing by it won't work.
+        self.assertRaises(BadPluralExpression,
+                          make_friendly_plural_forms, '(1/n)', 1)
+
+
+def test_suite():
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(PluralFormsTest))
+    return suite
+