Merge lp:~abentley/launchpad/remember-archive into lp:launchpad

[Aaron Bentley]

recipe build requests use last-built archive as default

= Summary =
Fix bug #582489:source package recipe builds should remember last-used archive

== Proposed fix ==
See above

== Pre-implementation notes ==
Discussed with rockstar

== Implementation details ==
None

== Tests ==
bin/test -t test_request_builds_archive test_sourcepackagerecipe

== Demo and Q/A ==
Create a source package recipe, and request a build. (You'll also need at
least two PPAs.) The first archive should be selected. Choose a different
one. Request a new build. The previously-selected archive should now be
selected.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/code/browser/sourcepackagerecipe.py
  lib/lp/code/model/sourcepackagerecipe.py
  lib/lp/code/browser/tests/test_sourcepackagerecipe.py
  lib/lp/code/interfaces/sourcepackagerecipe.py

== Pylint notices ==

(Bogus warning)

lib/lp/code/interfaces/sourcepackagerecipe.py
    150: [C0322, ISourcePackageRecipe.requestBuild] Operator not preceded by a space
    distroseries=Reference(schema=IDistroSeries),
    ^
    )
    @export_write_operation()
    def requestBuild(archive, distroseries, requester, pocket):

[Paul Hummer (rockstar)]

review: Approve (code)

=== modified file 'lib/lp/code/browser/sourcepackagerecipe.py'
--- lib/lp/code/browser/sourcepackagerecipe.py	2010-05-07 20:01:34 +0000
+++ lib/lp/code/browser/sourcepackagerecipe.py	2010-05-26 19:27:30 +0000
@@ -191,7 +191,11 @@
 
         The distroseries function as defaults for requesting a build.
         """
-        return {'distros': self.context.distroseries}
+        initial_values = {'distros': self.context.distroseries}
+        build = self.context.getLastBuild()
+        if build is not None:
+            initial_values['archive'] = build.archive
+        return initial_values
 
     class schema(Interface):
         """Schema for requesting a build."""

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-05-20 03:10:49 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-05-26 19:27:30 +0000
@@ -20,7 +20,8 @@
     DatabaseFunctionalLayer, LaunchpadFunctionalLayer)
 from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.code.browser.sourcepackagerecipe import (
-    SourcePackageRecipeView, SourcePackageRecipeBuildView
+    SourcePackageRecipeView, SourcePackageRecipeRequestBuildsView,
+    SourcePackageRecipeBuildView
 )
 from lp.code.interfaces.sourcepackagerecipe import MINIMAL_RECIPE_TEXT
 from lp.soyuz.model.processor import ProcessorFamily
@@ -329,6 +330,16 @@
         # Secret Squirrel is checked by default.
         self.assertEqual(['Secret Squirrel', 'Woody'], build_distros)
 
+    def test_request_builds_archive(self):
+        recipe = self.factory.makeSourcePackageRecipe()
+        ppa2 = self.factory.makeArchive(
+            displayname='Secret PPA', owner=self.chef, name='ppa2')
+        view = SourcePackageRecipeRequestBuildsView(recipe, None)
+        self.assertIs(None, view.initial_values.get('archive'))
+        self.factory.makeSourcePackageRecipeBuild(recipe=recipe, archive=ppa2)
+        self.assertEqual(ppa2, view.initial_values.get('archive'))
+
+
 
 class TestSourcePackageRecipeBuildView(BrowserTestCase):
     """Test behaviour of SourcePackageReciptBuildView."""

=== modified file 'lib/lp/code/interfaces/sourcepackagerecipe.py'
--- lib/lp/code/interfaces/sourcepackagerecipe.py	2010-05-14 20:27:23 +0000
+++ lib/lp/code/interfaces/sourcepackagerecipe.py	2010-05-26 19:27:30 +0000
@@ -168,6 +168,9 @@
             False, select all builds that are not pending.
         """
 
+    def getLastBuild(self):
+        """Return the the most recent build of this recipe."""
+
     def destroySelf():
         """Remove this SourcePackageRecipe from the database.
 

=== modified file 'lib/lp/code/model/sourcepackagerecipe.py'
--- lib/lp/code/model/sourcepackagerecipe.py	2010-05-18 19:14:16 +0000
+++ lib/lp/code/model/sourcepackagerecipe.py	2010-05-26 19:27:30 +0000
@@ -177,6 +177,14 @@
         result.order_by(Desc(SourcePackageRecipeBuild.datebuilt))
         return result
 
+    def getLastBuild(self):
+        """See `ISourcePackageRecipeBuild`."""
+        store = Store.of(self)
+        result = store.find(
+            SourcePackageRecipeBuild, SourcePackageRecipeBuild.recipe == self)
+        result.order_by(Desc(SourcePackageRecipeBuild.datebuilt))
+        return result.first()
+
     def getMedianBuildDuration(self):
         """Return the median duration of builds of this recipe."""
         store = IStore(self)