Merge lp:~rockstar/launchpad/recipe-polish into lp:launchpad

[Paul Hummer]

This branch just fixes an issue with showing distroserieses in the recipe
add/edit forms that aren't part of a supported distro. Basically, we can't
build against a distroseries for a distro that doesn't have an archive
available for it. It's a simple branch (simpler than I was originally
working...)

[Māris Fogels (mars)]

Looks good to me. r=mars.

<mars> rockstar, why did you nuke all of that test output around line 49 of the diff? I don't see anything in your code that would suggest its removal.
<rockstar> mars, they were distroseries that have distributions that have no archives.
<rockstar> mars, basically, this branch prevents someone trying to request a recipe build for lenny (Debian)
<rockstar> ...because we don't support any distro but Ubuntu.
<mars> oh! So your fix works, because it proved that the tests themselves had invalid distros in there
<rockstar> mars, yup.
<mars> rockstar, ok. Do you need a test for the explicit exclusion of a distro?
<mars> rockstar, a unit test or something?
<rockstar> mars, no, I don't think so.
<rockstar> The test coverage is being accomplished properly with what we have now.
<mars> ok

review: Approve

=== modified file 'lib/lp/code/browser/sourcepackagerecipe.py'
--- lib/lp/code/browser/sourcepackagerecipe.py	2010-05-05 20:01:56 +0000
+++ lib/lp/code/browser/sourcepackagerecipe.py	2010-05-07 20:16:29 +0000
@@ -166,9 +166,12 @@
 
 def buildable_distroseries_vocabulary(context):
     """Return a vocabulary of buildable distroseries."""
+    ppas = getUtility(IArchiveSet).getPPAsForUser(getUtility(ILaunchBag).user)
+    supported_distros = [ppa.distribution for ppa in ppas]
     dsset = getUtility(IDistroSeriesSet).search()
     terms = [SimpleTerm(distro, distro.id, distro.displayname)
-             for distro in dsset if distro.active]
+             for distro in dsset if (
+                 distro.active and distro.distribution in supported_distros)]
     return SimpleVocabulary(terms)
 
 def target_ppas_vocabulary(context):

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-05-06 21:12:19 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-05-07 20:16:29 +0000
@@ -38,7 +38,8 @@
         self.ppa = self.factory.makeArchive(
             displayname='Secret PPA', owner=self.chef, name='ppa')
         self.squirrel = self.factory.makeDistroSeries(
-            displayname='Secret Squirrel', name='secret')
+            displayname='Secret Squirrel', name='secret',
+            distribution=self.ppa.distribution)
 
     def makeRecipe(self):
         """Create and return a specific recipe."""
@@ -129,7 +130,8 @@
 
     def test_edit_recipe(self):
         self.factory.makeDistroSeries(
-            displayname='Mumbly Midget', name='mumbly')
+            displayname='Mumbly Midget', name='mumbly',
+            distribution=self.ppa.distribution)
         product = self.factory.makeProduct(
             name='ratatouille', displayname='Ratatouille')
         veggie_branch = self.factory.makeBranch(
@@ -295,14 +297,9 @@
             Archive:
             Secret PPA (chef/ppa)
             Distribution series:
+            Secret Squirrel
             Warty
             Hoary
-            Six
-            7.0
-            Woody
-            Sarge
-            Guada2005
-            Secret Squirrel
             or
             Cancel""")
         main_text = self.getMainText(recipe, '+request-builds')
@@ -310,6 +307,9 @@
 
     def test_request_builds_action(self):
         """Requesting a build creates pending builds."""
+        woody = self.factory.makeDistroSeries(
+            name='woody', displayname='Woody',
+            distribution=self.ppa.distribution)
         recipe = self.makeRecipe()
         browser = self.getViewBrowser(recipe, '+request-builds')
         browser.getControl('Woody').click()