Merge lp:~salgado/launchpad/workitem-migration-allow-inactive-milestones into lp:launchpad

[Guilherme Salgado]

[r=sinzui][bug=944987] Make sure work items targeted to inactive milestones are migrated. Also move the work item migration job from the hourly garbo to the frequent one.

Make sure work items targeted to inactive milestones are migrated.

[Curtis Hovey (sinzui)]

This is good to land.

review: Approve (code)

[Curtis Hovey (sinzui)]

We agreed to change the garbo frequency because only the first two runs were long, taking a couple of minutes.

=== modified file 'lib/lp/blueprints/tests/test_workitem_migration.py'
--- lib/lp/blueprints/tests/test_workitem_migration.py	2012-02-29 15:22:38 +0000
+++ lib/lp/blueprints/tests/test_workitem_migration.py	2012-03-02 18:04:22 +0000
@@ -196,6 +196,20 @@
             assignee=None, title="A single work item", milestone=milestone,
             status=SpecificationWorkItemStatus.TODO, specification=spec))
 
+    def test_work_item_with_inactive_milestone(self):
+        milestone = self.factory.makeMilestone(active=False)
+        whiteboard = dedent("""
+            Work items for %s:
+            A single work item: TODO
+            """ % milestone.name)
+        spec = self.factory.makeSpecification(
+            whiteboard=whiteboard, product=milestone.product)
+        work_items = extractWorkItemsFromWhiteboard(spec)
+        self.assertEqual(1, len(work_items))
+        self.assertThat(work_items[0], MatchesStructure.byEquality(
+            assignee=None, title="A single work item", milestone=milestone,
+            status=SpecificationWorkItemStatus.TODO, specification=spec))
+
     def test_work_item_with_unknown_milestone(self):
         whiteboard = dedent("""
             Work items for foo:

=== modified file 'lib/lp/blueprints/workitemmigration.py'
--- lib/lp/blueprints/workitemmigration.py	2012-02-29 15:04:36 +0000
+++ lib/lp/blueprints/workitemmigration.py	2012-03-02 18:04:22 +0000
@@ -81,7 +81,9 @@
         for word in words:
             if word == milestone.name:
                 return milestone
-    raise WorkItemParseError("No valid milestones found in %s" % words)
+    raise WorkItemParseError(
+        "No valid milestones found in %s. Valid milestone names are %s"
+        % (words, [m.name for m in valid_milestones]))
 
 
 def extractWorkItemsFromWhiteboard(spec):
@@ -94,7 +96,7 @@
     in_wi_block = False
     new_whiteboard = []
 
-    target_milestones = list(spec.target.milestones)
+    target_milestones = list(spec.target.all_milestones)
     wi_lines = []
     # Iterate over all lines in the whiteboard and whenever we find a line
     # matching work_items_re we 'continue' and store the following lines

=== modified file 'lib/lp/scripts/garbo.py'
--- lib/lp/scripts/garbo.py	2012-03-01 15:59:27 +0000
+++ lib/lp/scripts/garbo.py	2012-03-02 18:04:22 +0000
@@ -1293,6 +1293,7 @@
         OpenIDConsumerNoncePruner,
         OpenIDConsumerAssociationPruner,
         AntiqueSessionPruner,
+        SpecificationWorkitemMigrator,
         ]
     experimental_tunable_loops = []
 
@@ -1314,7 +1315,6 @@
         UnusedSessionPruner,
         DuplicateSessionPruner,
         BugHeatUpdater,
-        SpecificationWorkitemMigrator,
         ]
     experimental_tunable_loops = []
 

=== modified file 'lib/lp/scripts/tests/test_garbo.py'
--- lib/lp/scripts/tests/test_garbo.py	2012-03-01 15:46:15 +0000
+++ lib/lp/scripts/tests/test_garbo.py	2012-03-02 18:04:22 +0000
@@ -1028,7 +1028,7 @@
         spec = self.factory.makeSpecification(whiteboard=whiteboard)
         transaction.commit()
 
-        self.runHourly()
+        self.runFrequently()
 
         self.assertEqual(whiteboard, spec.whiteboard)
         self.assertEqual(0, spec.work_items.count())
@@ -1052,7 +1052,7 @@
             u'default', 0, u'garbo.workitem_migrator.enabled', u'True'))
         transaction.commit()
 
-        self.runHourly()
+        self.runFrequently()
 
         self.assertEqual('', spec.whiteboard.strip())
         self.assertEqual(2, spec.work_items.count())
@@ -1079,7 +1079,7 @@
             u'default', 0, u'garbo.workitem_migrator.enabled', u'True'))
         transaction.commit()
 
-        self.runHourly()
+        self.runFrequently()
 
         self.assertEqual(whiteboard, spec.whiteboard)
         self.assertEqual(0, spec.work_items.count())

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2012-02-29 13:27:51 +0000
+++ lib/lp/testing/factory.py	2012-03-02 18:04:22 +0000
@@ -848,7 +848,7 @@
         return getUtility(ITranslatorSet).new(group, language, person)
 
     def makeMilestone(self, product=None, distribution=None,
-                      productseries=None, name=None):
+                      productseries=None, name=None, active=True):
         if product is None and distribution is None and productseries is None:
             product = self.makeProduct()
         if distribution is None:
@@ -864,7 +864,7 @@
         return ProxyFactory(
             Milestone(product=product, distribution=distribution,
                       productseries=productseries, distroseries=distroseries,
-                      name=name))
+                      name=name, active=active))
 
     def makeProcessor(self, family=None, name=None, title=None,
                       description=None):