Merge lp:~rockstar/launchpad/lil-recipe-bugs into lp:launchpad

[Paul Hummer]

Fix many recipe bugs.

This branch fixes a couple of little recipe bugs that were marked high. These changes are the kind that don't really have tests to go along with them.

[Deryck Hodge (deryck)]

<deryck> rockstar, "this the archive where the package" should be "this *is* the archive where the package" ?
<rockstar> deryck, fixeded.
<deryck> rockstar, r=me then
<rockstar> This is why we get reviews, even for little branches...

review: Approve (code)

=== modified file 'lib/lp/blueprints/interfaces/specification.py'
--- lib/lp/blueprints/interfaces/specification.py	2010-11-04 03:34:54 +0000
+++ lib/lp/blueprints/interfaces/specification.py	2010-11-05 17:57:18 +0000
@@ -37,6 +37,7 @@
 from canonical.launchpad import _
 from canonical.launchpad.interfaces.validation import valid_webref
 from canonical.launchpad.validators import LaunchpadValidationError
+<<<<<<< TREE
 from lp.blueprints.enums import (
     SpecificationDefinitionStatus,
     SpecificationGoalStatus,
@@ -44,6 +45,14 @@
     SpecificationLifecycleStatus,
     SpecificationPriority,
     )
+=======
+from lp.blueprints.enums import (
+    SpecificationDefinitionStatus,
+    SpecificationGoalStatus,
+    SpecificationImplementationStatus,
+    SpecificationPriority,
+    )
+>>>>>>> MERGE-SOURCE
 from lp.blueprints.interfaces.specificationtarget import IHasSpecifications
 from lp.blueprints.interfaces.sprint import ISprint
 from lp.code.interfaces.branchlink import IHasLinkedBranches

=== modified file 'lib/lp/bugs/tests/test_bugtask_search.py'
--- lib/lp/bugs/tests/test_bugtask_search.py	2010-11-04 15:53:15 +0000
+++ lib/lp/bugs/tests/test_bugtask_search.py	2010-11-05 17:57:18 +0000
@@ -486,6 +486,204 @@
         params = self.getBugTaskSearchParams(user=None, has_cve=True)
         self.assertSearchFinds(params, self.bugtasks[:1])
 
+    def setUpFullTextSearchTests(self):
+        # Set text fields indexed by Bug.fti, BugTask.fti or
+        # MessageChunk.fti to values we can search for.
+        for bugtask, number in zip(self.bugtasks, ('one', 'two', 'three')):
+            commenter = self.bugtasks[0].bug.owner
+            with person_logged_in(commenter):
+                bugtask.statusexplanation = 'status explanation %s' % number
+                bugtask.bug.title = 'bug title %s' % number
+                bugtask.bug.newMessage(
+                    owner=commenter, content='comment %s' % number)
+
+    def test_fulltext_search(self):
+        # Full text searches find text indexed by Bug.fti...
+        self.setUpFullTextSearchTests()
+        params = self.getBugTaskSearchParams(
+            user=None, searchtext='one title')
+        search_result = self.runSearch(params)
+        expected = self.resultValuesForBugtasks(self.bugtasks[:1])
+        self.assertEqual(expected, search_result)
+        # ... by BugTask.fti ...
+        params = self.getBugTaskSearchParams(
+            user=None, searchtext='two explanation')
+        search_result = self.runSearch(params)
+        expected = self.resultValuesForBugtasks(self.bugtasks[1:2])
+        self.assertEqual(expected, search_result)
+        # ...and by MessageChunk.fti
+        params = self.getBugTaskSearchParams(
+            user=None, searchtext='three comment')
+        search_result = self.runSearch(params)
+        expected = self.resultValuesForBugtasks(self.bugtasks[2:3])
+        self.assertEqual(expected, search_result)
+
+    def test_fast_fulltext_search(self):
+        # Fast full text searches find text indexed by Bug.fti...
+        self.setUpFullTextSearchTests()
+        params = self.getBugTaskSearchParams(
+            user=None, fast_searchtext='one title')
+        search_result = self.runSearch(params)
+        expected = self.resultValuesForBugtasks(self.bugtasks[:1])
+        self.assertEqual(expected, search_result)
+        # ... but not text indexed by BugTask.fti ...
+        params = self.getBugTaskSearchParams(
+            user=None, fast_searchtext='two explanation')
+        search_result = self.runSearch(params)
+        self.assertEqual([], search_result)
+        # ..or by MessageChunk.fti
+        params = self.getBugTaskSearchParams(
+            user=None, fast_searchtext='three comment')
+        search_result = self.runSearch(params)
+        self.assertEqual([], search_result)
+
+    def test_has_no_upstream_bugtask(self):
+        # Search results can be limited to bugtasks of bugs that do
+        # not have a related upstream task.
+        #
+        # All bugs created in makeBugTasks() have at least one
+        # bug task for a product: The default bug task created
+        # by lp.testing.factory.Factory.makeBug() if neither a
+        # product nor a distribution is specified. For distribution
+        # related tests we need another bug which does not have
+        # an upstream (aka product) bug task, otherwise the set of
+        # bugtasks returned for a search for has_no_upstream_bugtask
+        # would always be empty.
+        if (IDistribution.providedBy(self.searchtarget) or
+            IDistroSeries.providedBy(self.searchtarget) or
+            ISourcePackage.providedBy(self.searchtarget) or
+            IDistributionSourcePackage.providedBy(self.searchtarget)):
+            if IDistribution.providedBy(self.searchtarget):
+                bug = self.factory.makeBug(distribution=self.searchtarget)
+                expected = self.resultValuesForBugtasks([bug.default_bugtask])
+            else:
+                bug = self.factory.makeBug(
+                    distribution=self.searchtarget.distribution)
+                bugtask = self.factory.makeBugTask(
+                    bug=bug, target=self.searchtarget)
+                expected = self.resultValuesForBugtasks([bugtask])
+        else:
+            # Bugs without distribution related bugtasks have always at
+            # least one product related bugtask, hence a
+            # has_no_upstream_bugtask search will always return an
+            # empty result set.
+            expected = []
+        params = self.getBugTaskSearchParams(
+            user=None, has_no_upstream_bugtask=True)
+        search_result = self.runSearch(params)
+        self.assertEqual(expected, search_result)
+
+    def changeStatusOfBugTaskForOtherProduct(self, bugtask, new_status):
+        # Change the status of another bugtask of the same bug to the
+        # given status.
+        bug = bugtask.bug
+        for other_task in bug.bugtasks:
+            other_target = other_task.target
+            if other_task != bugtask and IProduct.providedBy(other_target):
+                with person_logged_in(other_target.owner):
+                    other_task.transitionToStatus(
+                        new_status, other_target.owner)
+                return
+        self.fail(
+            'No bug task found for a product that is not the target of '
+            'the main test bugtask.')
+
+    def test_upstream_status(self):
+        # Search results can be filtered by the status of an upstream
+        # bug task.
+        #
+        # The bug task status of the default test data has only bug tasks
+        # with status NEW for the "other" product, hence all bug tasks
+        # will be returned in a search for bugs that are open upstream.
+        params = self.getBugTaskSearchParams(user=None, open_upstream=True)
+        search_result = self.runSearch(params)
+        expected = self.resultValuesForBugtasks(self.bugtasks)
+        self.assertEqual(expected, search_result)
+        # A search for tasks resolved upstream does not yield any bugtask.
+        params = self.getBugTaskSearchParams(
+            user=None, resolved_upstream=True)
+        search_result = self.runSearch(params)
+        self.assertEqual([], search_result)
+        # But if we set upstream bug tasks to "fix committed" or "fix
+        # released", the related bug tasks for our test target appear in
+        # the search result.
+        self.changeStatusOfBugTaskForOtherProduct(
+            self.bugtasks[0], BugTaskStatus.FIXCOMMITTED)
+        self.changeStatusOfBugTaskForOtherProduct(
+            self.bugtasks[1], BugTaskStatus.FIXRELEASED)
+        search_result = self.runSearch(params)
+        expected = self.resultValuesForBugtasks(self.bugtasks[:2])
+        self.assertEqual(expected, search_result)
+        # A search for bug tasks open upstream now returns only one
+        # test task.
+        params = self.getBugTaskSearchParams(user=None, open_upstream=True)
+        search_result = self.runSearch(params)
+        expected = self.resultValuesForBugtasks(self.bugtasks[2:])
+
+    def test_tags(self):
+        # Search results can be limited to bugs having given tags.
+        with person_logged_in(self.owner):
+            self.bugtasks[0].bug.tags = ['tag1', 'tag2']
+            self.bugtasks[1].bug.tags = ['tag1', 'tag3']
+        params = self.getBugTaskSearchParams(
+            user=None, tag=any('tag2', 'tag3'))
+        search_result = self.runSearch(params)
+        expected = self.resultValuesForBugtasks(self.bugtasks[:2])
+        self.assertEqual(expected, search_result)
+
+        params = self.getBugTaskSearchParams(
+            user=None, tag=all('tag2', 'tag3'))
+        search_result = self.runSearch(params)
+        self.assertEqual([], search_result)
+
+        params = self.getBugTaskSearchParams(
+            user=None, tag=all('tag1', 'tag3'))
+        search_result = self.runSearch(params)
+        expected = self.resultValuesForBugtasks(self.bugtasks[1:2])
+        self.assertEqual(expected, search_result)
+
+        params = self.getBugTaskSearchParams(
+            user=None, tag=all('tag1', '-tag3'))
+        search_result = self.runSearch(params)
+        expected = self.resultValuesForBugtasks(self.bugtasks[:1])
+        self.assertEqual(expected, search_result)
+
+        params = self.getBugTaskSearchParams(
+            user=None, tag=all('-tag1'))
+        search_result = self.runSearch(params)
+        expected = self.resultValuesForBugtasks(self.bugtasks[2:])
+        self.assertEqual(expected, search_result)
+
+        params = self.getBugTaskSearchParams(
+            user=None, tag=all('*'))
+        search_result = self.runSearch(params)
+        expected = self.resultValuesForBugtasks(self.bugtasks[:2])
+        self.assertEqual(expected, search_result)
+
+        params = self.getBugTaskSearchParams(
+            user=None, tag=all('-*'))
+        search_result = self.runSearch(params)
+        expected = self.resultValuesForBugtasks(self.bugtasks[2:])
+        self.assertEqual(expected, search_result)
+
+    def test_date_closed(self):
+        # Search results can be filtered by the date_closed time
+        # of a bugtask.
+        with person_logged_in(self.owner):
+            self.bugtasks[2].transitionToStatus(
+                BugTaskStatus.FIXRELEASED, self.owner)
+        utc_now = datetime.now(pytz.timezone('UTC'))
+        self.assertTrue(utc_now >= self.bugtasks[2].date_closed)
+        params = self.getBugTaskSearchParams(
+            user=None, date_closed=greater_than(utc_now-timedelta(days=1)))
+        search_result = self.runSearch(params)
+        expected = self.resultValuesForBugtasks(self.bugtasks[2:])
+        self.assertEqual(expected, search_result)
+        params = self.getBugTaskSearchParams(
+            user=None, date_closed=greater_than(utc_now+timedelta(days=1)))
+        search_result = self.runSearch(params)
+        self.assertEqual([], search_result)
+
 
 class ProductAndDistributionTests:
     """Tests which are useful for distributions and products."""
@@ -503,8 +701,15 @@
         with person_logged_in(self.owner):
             self.bugtasks[0].bug.addNomination(nominator, series1)
             self.bugtasks[1].bug.addNomination(nominator, series2)
+<<<<<<< TREE
         params = self.getBugTaskSearchParams(user=None, nominated_for=series1)
         self.assertSearchFinds(params, self.bugtasks[:1])
+=======
+        params = self.getBugTaskSearchParams(user=None, nominated_for=series1)
+        search_result = self.runSearch(params)
+        expected = self.resultValuesForBugtasks(self.bugtasks[:1])
+        self.assertEqual(expected, search_result)
+>>>>>>> MERGE-SOURCE
 
 
 class BugTargetTestBase:

=== modified file 'lib/lp/code/browser/sourcepackagerecipe.py'
--- lib/lp/code/browser/sourcepackagerecipe.py	2010-10-29 00:07:20 +0000
+++ lib/lp/code/browser/sourcepackagerecipe.py	2010-11-05 17:57:18 +0000
@@ -274,10 +274,16 @@
         'build_daily',
         ])
     daily_build_archive = Choice(vocabulary='TargetPPAs',
-        title=u'Daily build archive')
+        title=u'Daily build archive',
+        description=(
+            u'If built daily, this is the archive where the package '
+            u'will be uploaded.'))
     distros = List(
         Choice(vocabulary='BuildableDistroSeries'),
-        title=u'Default Distribution series')
+        title=u'Default distribution series',
+        description=(
+            u'If built daily, these are the distribution versions that '
+            u'the recipe will be built for.'))
     recipe_text = Text(
         title=u'Recipe text', required=True,
         description=u'The text of the recipe.')

=== modified file 'lib/lp/code/help/related-recipes.html'
--- lib/lp/code/help/related-recipes.html	2010-11-04 22:50:52 +0000
+++ lib/lp/code/help/related-recipes.html	2010-11-05 17:57:18 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 <html>
   <head>
     <title>Related source package recipes</title>
@@ -36,3 +37,35 @@
 
   </body>
 </html>
+=======
+<html>
+  <head>
+    <title>Related source package recipes</title>
+    <link rel="stylesheet" type="text/css"
+          href="/+icing/yui/cssreset/reset.css" />
+    <link rel="stylesheet" type="text/css"
+          href="/+icing/yui/cssfonts/fonts.css" />
+    <link rel="stylesheet" type="text/css"
+          href="/+icing/yui/cssbase/base.css" />
+  </head>
+  <body>
+    <h1>Related source package recipes</h1>
+
+    <p>
+      You can ask Launchpad to make an automatic daily build
+      of the code in this branch and place the resultant package(s)
+      in your chosen PPA. (<a href="https://help.launchpad.net/Packaging/SourceBuilds" target="_blank">Read more</a>)
+    </p>
+
+    <p>A "recipe" is a description of the steps bzr-builder should take to
+      construct a source package from the various bzr branches. Its format
+      specifies:</p>
+    <ul class="bulleted">
+      <li>where to use the code from (trunk branch, beta branch, etc.), where to get the packaging from (separate branch? ubuntu branch?)</li>
+      <li>the correct package version (so users will still be able to upgrade to the stable version of the distro once it gets released)</li>
+      <li>what to modify to make the source build properly</li>
+    </ul>
+
+  </body>
+</html>
+>>>>>>> MERGE-SOURCE

=== modified file 'lib/lp/code/interfaces/sourcepackagerecipe.py'
--- lib/lp/code/interfaces/sourcepackagerecipe.py	2010-11-05 07:43:04 +0000
+++ lib/lp/code/interfaces/sourcepackagerecipe.py	2010-11-05 17:57:18 +0000
@@ -55,6 +55,7 @@
 from lp.registry.interfaces.role import IHasOwner
 from lp.services import features
 from lp.services.fields import (
+    Description,
     PersonChoice,
     PublicPersonChoice,
     )
@@ -179,7 +180,7 @@
             constraint=name_validator,
             description=_("The name of this recipe.")))
 
-    description = Text(
+    description = Description(
         title=_('Description'), required=True,
         description=_('A short description of the recipe.'))