Merge lp:~leonardr/launchpad/publish-distro-series-for-recipe into lp:launchpad

[Tim Penhey]

Unmerged revisions

12444. By Leonard Richardson on 2011-02-23

Added fake implementations of addDistroSeries and removeDistroSeries.

12443. By Leonard Richardson on 2011-02-23

Published the distroseries in the web service starting in version devel.

=== modified file 'lib/lp/code/interfaces/sourcepackagerecipe.py'
--- lib/lp/code/interfaces/sourcepackagerecipe.py	2011-02-22 23:07:17 +0000
+++ lib/lp/code/interfaces/sourcepackagerecipe.py	2011-02-23 20:46:44 +0000
@@ -179,10 +179,11 @@
             vocabulary='UserTeamsParticipationPlusSelf',
             description=_("The person or team who can edit this recipe.")))
 
-    distroseries = CollectionField(
-        Reference(IDistroSeries), title=_("The distroseries this recipe will"
-            " build a source package for"),
-        readonly=False)
+    distroseries = exported(CollectionField(
+            value_type=Reference(schema=IDistroSeries),
+            title=_("This recipe will build a source package for these "
+                    "distroseries."),
+        readonly=False), (("devel", dict(exported=True))), exported=False)
     build_daily = exported(Bool(
         title=_("Built daily"),
         description=_("Automatically build each day, if the source has changed.")))
@@ -203,6 +204,26 @@
 
     is_stale = Bool(title=_('Recipe is stale.'))
 
+    @operation_parameters(distro_series=Reference(schema=IDistroSeries))
+    @export_write_operation()
+    @operation_for_version("devel")
+    def addDistroSeries(distro_series):
+        """Start building source packages for an additional distro series.
+
+        :param distroseries: The distro series for which source
+            packages should be built.
+        """
+
+    @operation_parameters(distro_series=Reference(schema=IDistroSeries))
+    @export_write_operation()
+    @operation_for_version("devel")
+    def removeDistroSeries(distro_series):
+        """Stop building source packages for a given distro series.
+
+        :param distroseries: The distro series for which source
+            packages should no longer be built.
+        """
+
 
 class ISourcePackageRecipe(ISourcePackageRecipeData,
     ISourcePackageRecipeEdit, ISourcePackageRecipeEditableAttributes,
 
=== modified file 'lib/lp/code/model/sourcepackagerecipe.py'
--- lib/lp/code/model/sourcepackagerecipe.py	2011-02-19 00:30:04 +0000
+++ lib/lp/code/model/sourcepackagerecipe.py	2011-02-23 20:46:44 +0000
@@ -342,3 +342,11 @@
             return None
         durations.sort(reverse=True)
         return durations[len(durations) / 2]
+
+    def addDistroSeries(self, distro_series):
+        """Add a distroseries to the list of series that get builds."""
+        pass
+
+    def removeDistroSeries(self, distro_series):
+        """Add a distroseries to the list of series that get builds."""
+        pass
 
=== added file 'lib/lp/code/tests/test_recipe_webservice.py'
--- lib/lp/code/tests/test_recipe_webservice.py	1970-01-01 00:00:00 +0000
+++ lib/lp/code/tests/test_recipe_webservice.py	2011-02-23 20:46:44 +0000
@@ -0,0 +1,40 @@
+# Copyright 2011 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+__metaclass__ = type
+
+from canonical.testing.layers import DatabaseFunctionalLayer
+from lp.testing import (
+    launchpadlib_for,
+    login_person,
+    logout,
+    TestCaseWithFactory,
+    )
+
+
+class TestRecipeDistroSeries(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
+
+    def setUp(self):
+        super(TestRecipeDistroSeries, self).setUp()
+        recipe = self.factory.makeSourcePackageRecipe()
+        self.recipe_name = recipe.name
+        self.owner_name = recipe.owner.name
+
+    def test_distroseries_present_in_devel(self):
+        lp = launchpadlib_for("test", self.owner_name, version="devel")
+        recipe = lp.me.getRecipe(name=self.recipe_name)
+        self.assertEqual(len(recipe.distroseries), 1)
+
+    def test_distroseries_not_present_in_10(self):
+        lp = launchpadlib_for("test", self.owner_name, version="1.0")
+        recipe_in_10 = lp.me.getRecipe(name=self.recipe_name)
+        self.assertFalse(hasattr(recipe_in_10, 'distroseries'))
+
+    def test_add_distroseries(self):
+        series = self.factory.makeSourcePackageRecipeDistroseries()
+        lp = launchpadlib_for("test", self.owner_name, version="devel")
+        recipe = lp.me.getRecipe(name=self.recipe_name)
+        distro_series = lp.distributions['ubuntu'].getSeries(name_or_version='warty')
+        recipe.addDistroSeries(distro_series=distro_series)