Merge lp:~replaceafill/launchpad/bug-210821 into lp:launchpad

[Douglas Cerna]

Filtered inactive products and projects out of pillars list for bug tracker sets.

Filtered inactive products and projects out of pillars list for bug tracker sets.

[Curtis Hovey (sinzui)]

change
    login(ADMIN_EMAIL)
to
    login_celebrity('admin')
because the first case relies on sample data that is logging in a user that can skew the test results.

review: Needs Fixing (code)

[Curtis Hovey (sinzui)]

Thank you. I will land this now.

review: Approve (code)

=== modified file 'lib/lp/bugs/model/bugtracker.py'
--- lib/lp/bugs/model/bugtracker.py	2011-12-30 06:14:56 +0000
+++ lib/lp/bugs/model/bugtracker.py	2012-06-22 18:44:21 +0000
@@ -845,9 +845,11 @@
         from lp.registry.model.projectgroup import ProjectGroup
         ids = [str(b.id) for b in bugtrackers]
         products = Product.select(
-            "bugtracker in (%s)" % ",".join(ids), orderBy="name")
+            "bugtracker in (%s) AND active IS True" %
+            ",".join(ids), orderBy="name")
         projects = ProjectGroup.select(
-            "bugtracker in (%s)" % ",".join(ids), orderBy="name")
+            "bugtracker in (%s) AND active IS True" %
+            ",".join(ids), orderBy="name")
         ret = {}
         for product in products:
             ret.setdefault(product.bugtracker, []).append(product)

=== modified file 'lib/lp/bugs/tests/test_bugtracker.py'
--- lib/lp/bugs/tests/test_bugtracker.py	2012-01-01 02:58:52 +0000
+++ lib/lp/bugs/tests/test_bugtracker.py	2012-06-22 18:44:21 +0000
@@ -45,6 +45,7 @@
 from lp.testing import (
     login,
     login_person,
+    login_celebrity,
     TestCase,
     TestCaseWithFactory,
     )
@@ -77,6 +78,29 @@
         # but not in active.
         self.assertFalse(tracker in trackers.trackers(active=True))
 
+    def test_inactive_products_in_pillars(self):
+        # the list of pillars should only contain active
+        # products and projects
+        tracker = self.factory.makeBugTracker()
+        trackers = BugTrackerSet()
+        product1 = self.factory.makeProduct()
+        product2 = self.factory.makeProduct()
+        project1 = self.factory.makeProject()
+        project2 = self.factory.makeProject()
+        login_celebrity('admin')
+        product1.bugtracker = tracker
+        product2.bugtracker = tracker
+        project1.bugtracker = tracker
+        project2.bugtracker = tracker
+        pillars = trackers.getPillarsForBugtrackers(trackers)
+        self.assertContentEqual(
+            [product1, product2, project1, project2], pillars[tracker])
+        product1.active = False
+        project2.active = False
+        pillars = trackers.getPillarsForBugtrackers(trackers)
+        self.assertContentEqual(
+            [product2, project1], pillars[tracker])
+
 
 class BugTrackerTestCase(TestCaseWithFactory):
     """Unit tests for the `BugTracker` class."""