Merge lp:~al-maisan/launchpad/conflict-resolution-20100228 into lp:launchpad/db-devel

[Muharem Hrnjadovic]

[Muharem Hrnjadovic (al-maisan)]

Resolves the most recent merge conflict, the test modified by the branch that causes the conflict runs OK.

[Michael Nelson (michael.nelson)]

Thanks Muharem! That fixes the soyuz-related failures result of code that *didn't* conflict (as I had to use secure_record on devel for some new tests which were obviously not touched by bigjools' branch).

I'll email about the remaining max_bug_heat issue.

review: Approve (code)

=== modified file 'lib/lp/bugs/doc/bug-heat.txt'
--- lib/lp/bugs/doc/bug-heat.txt	2010-01-12 16:41:23 +0000
+++ lib/lp/bugs/doc/bug-heat.txt	2010-02-28 14:13:18 +0000
@@ -44,6 +44,14 @@
     >>> bug_1.heat
     0
 
+We touch bug 1 to make sure its date_last_updated is recent enough (bug heat
+decays over time).
+
+    >>> new_comment = bug_1.newMessage(
+    ...     owner=bug_1.owner, subject="...", content="...")
+    >>> import transaction ; transaction.commit()
+    >>> bug_1 = getUtility(IBugSet).get(1)
+
     >>> update_bug_heat(chunk_size=1)
     DEBUG Updating 1 Bugs (starting id: ...)
     ...

=== modified file 'lib/lp/bugs/scripts/bugheat.py'
--- lib/lp/bugs/scripts/bugheat.py	2010-02-01 11:56:15 +0000
+++ lib/lp/bugs/scripts/bugheat.py	2010-02-28 14:13:18 +0000
@@ -8,6 +8,9 @@
     'BugHeatCalculator',
     ]
 
+from datetime import datetime
+
+from lp.bugs.interfaces.bugtask import RESOLVED_BUGTASK_STATUSES
 
 class BugHeatConstants:
 
@@ -56,8 +59,16 @@
             len(direct_subscribers) + len(subscribers_from_dupes))
         return subscriber_count * BugHeatConstants.SUBSCRIBER
 
+    def _bugIsComplete(self):
+        """Are all the tasks for this bug resolved?"""
+        return all([(task.status in RESOLVED_BUGTASK_STATUSES)
+                    for task in self.bug.bugtasks])
+
     def getBugHeat(self):
         """Return the total heat for the current bug."""
+        if self._bugIsComplete():
+            return 0
+
         total_heat = sum([
             self._getHeatFromAffectedUsers(),
             self._getHeatFromDuplicates(),
@@ -66,5 +77,12 @@
             self._getHeatFromSubscribers(),
             ])
 
+        # Bugs decay over time. Every month the bug isn't touched its heat
+        # decreases by 10%.
+        months = (
+            datetime.utcnow() -
+            self.bug.date_last_updated.replace(tzinfo=None)).days / 30
+        total_heat = int(total_heat * (0.9 ** months))
+
         return total_heat
 

=== modified file 'lib/lp/bugs/scripts/tests/test_bugheat.py'
--- lib/lp/bugs/scripts/tests/test_bugheat.py	2010-01-12 16:41:23 +0000
+++ lib/lp/bugs/scripts/tests/test_bugheat.py	2010-02-28 14:13:18 +0000
@@ -1,4 +1,3 @@
-
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
@@ -8,12 +7,14 @@
 
 import unittest
 
+from datetime import datetime, timedelta
+
 from canonical.testing import LaunchpadZopelessLayer
 
+from lp.bugs.interfaces.bugtask import BugTaskStatus
 from lp.bugs.scripts.bugheat import BugHeatCalculator, BugHeatConstants
 from lp.testing import TestCaseWithFactory
 
-
 class TestBugHeatCalculator(TestCaseWithFactory):
     """Tests for the BugHeatCalculator class."""
 
@@ -177,6 +178,35 @@
             "Expected bug heat did not match actual bug heat. "
             "Expected %s, got %s" % (expected_heat, actual_heat))
 
+    def test_getBugHeat_complete_bugs(self):
+        # Bug which are in a resolved status don't have heat at all.
+        complete_bug = self.factory.makeBug()
+        heat = BugHeatCalculator(complete_bug).getBugHeat()
+        self.assertNotEqual(
+            0, heat,
+            "Expected bug heat did not match actual bug heat. "
+            "Expected a positive value, got 0")
+        complete_bug.bugtasks[0].transitionToStatus(
+            BugTaskStatus.INVALID, complete_bug.owner)
+        heat = BugHeatCalculator(complete_bug).getBugHeat()
+        self.assertEqual(
+            0, heat,
+            "Expected bug heat did not match actual bug heat. "
+            "Expected %s, got %s" % (0, heat))
+
+    def test_getBugHeat_decay(self):
+        # Every month, a bug that wasn't touched has its heat reduced by 10%.
+        aging_bug = self.factory.makeBug()
+        fresh_heat = BugHeatCalculator(aging_bug).getBugHeat()
+        aging_bug.date_last_updated = (
+            aging_bug.date_last_updated - timedelta(days=32))
+        expected = int(fresh_heat * 0.9)
+        heat = BugHeatCalculator(aging_bug).getBugHeat()
+        self.assertEqual(
+            expected, heat,
+            "Expected bug heat did not match actual bug heat. "
+            "Expected %s, got %s" % (expected, heat))
+
 
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/soyuz/doc/archive.txt'
--- lib/lp/soyuz/doc/archive.txt	2010-02-27 20:20:03 +0000
+++ lib/lp/soyuz/doc/archive.txt	2010-02-28 14:13:18 +0000
@@ -1835,6 +1835,7 @@
 limited to 5 items.
 
     >>> create_activity(cprov_archive, 20)
+    >>> transaction.commit()
     >>> print_most_active_ppas()
     PPA for Celso Providelo 20
     PPA for Foo Bar 10

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-person-packages.txt'
--- lib/lp/soyuz/stories/soyuz/xx-person-packages.txt	2010-02-27 20:20:03 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-person-packages.txt	2010-02-28 14:13:18 +0000
@@ -265,7 +265,7 @@
     >>> mark_private_ppa = factory.makeArchive(
     ...     owner=mark, name="p3a", distribution=ubuntu, private=True)
     >>> from zope.security.proxy import removeSecurityProxy
-    >>> removeSecurityProxy(source1_mark.secure_record).archive = (
+    >>> removeSecurityProxy(source1_mark).archive = (
     ...     mark_private_ppa)
     >>> logout()
     >>> user_browser.open("http://launchpad.dev/~cprov/+related-software")
@@ -288,7 +288,7 @@
     >>> login('[e-mail]')
     >>> cprov_private_ppa = factory.makeArchive(
     ...     owner=cprov, name="p3a", distribution=ubuntu, private=True)
-    >>> removeSecurityProxy(source1.secure_record).archive = (
+    >>> removeSecurityProxy(source1).archive = (
     ...     cprov_private_ppa)
     >>> source1.sourcepackagerelease.upload_archive = cprov_private_ppa
     >>> logout()