Merge lp:~abentley/launchpad/no-default-powerpc into lp:launchpad

[Aaron Bentley]

Cleanups from recipe-build-index.

= Summary =
Fixes for some issues I encountered while hacking on recipe build index:
 - test_sourcepackagerecipebuild should be in code/model/tests, not code/tests.
 - test_recipebuilder should be in code/model/tests, not code/tests.
 - LaunchpadObjectFactory.makeDistroArchSeries should default to None, not
   'powerpc'

== Proposed fix ==
See above.

== Pre-implementation notes ==
None

== Implementation details ==
Fixed the one callsite for makeDistroArchSeries that was specifying None.

== Tests ==
bin/test -t test_sourcepackagerecipebuild -t test_recipebuilder

== Demo and Q/A ==
None

= 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/model/tests/test_sourcepackagerecipebuild.py
  lib/lp/code/interfaces/sourcepackagerecipebuild.py
  configs/development/build-from-branch.zcml
  lib/lp/testing/factory.py
  lib/lp/code/templates/sourcepackagerecipebuild-index.pt
  lib/lp/testing/__init__.py
  lib/lp/code/model/sourcepackagerecipebuild.py
  lib/lp/code/templates/sourcepackagerecipe-index.pt
  lib/canonical/launchpad/webapp/configure.zcml
  lib/lp/code/browser/sourcepackagerecipe.py
  lib/canonical/launchpad/webapp/tales.py
  lib/lp/code/browser/tests/test_sourcepackagerecipe.py

[Paul Hummer (rockstar)]

review: Approve (code)

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-05-07 13:47:27 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-05-07 13:47:29 +0000
@@ -429,8 +429,8 @@
             my-recipe
             Build status
             Successfully built
-            Started on 2008-12-31
-            Finished on 2009-01-01
+            Started on .*
+            Finished on .*
             \(took 1 minute, 0.0 seconds\)
             buildlog \(8 bytes\)
             uploadlog \(10 bytes\)

=== modified file 'lib/lp/code/interfaces/sourcepackagerecipebuild.py'
--- lib/lp/code/interfaces/sourcepackagerecipebuild.py	2010-05-07 13:47:27 +0000
+++ lib/lp/code/interfaces/sourcepackagerecipebuild.py	2010-05-07 13:47:29 +0000
@@ -40,8 +40,7 @@
 
     binary_builds = CollectionField(
         Reference(IBinaryPackageBuild),
-            title=_("The binary builds that resulted from this."),
-            readonly=True)
+        title=_("The binary builds that resulted from this."), readonly=True)
 
     datestarted = Datetime(title=u'The time the build started.')
 

=== renamed file 'lib/lp/code/tests/test_recipebuilder.py' => 'lib/lp/code/model/tests/test_recipebuilder.py'
=== renamed file 'lib/lp/code/tests/test_sourcepackagerecipebuild.py' => 'lib/lp/code/model/tests/test_sourcepackagerecipebuild.py'
=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-05-07 13:47:27 +0000
+++ lib/lp/testing/factory.py	2010-05-07 13:47:29 +0000
@@ -1626,7 +1626,7 @@
     makeDistroSeries = makeDistroRelease
 
     def makeDistroArchSeries(self, distroseries=None,
-                             architecturetag='powerpc', processorfamily=None,
+                             architecturetag=None, processorfamily=None,
                              official=True, owner=None,
                              supports_virtualized=False):
         """Create a new distroarchseries"""
@@ -2171,8 +2171,7 @@
         if distroarchseries is None:
             distroarchseries = self.makeDistroArchSeries(
                 distroseries=source_package_release.upload_distroseries,
-                processorfamily=processor.family,
-                architecturetag=None)
+                processorfamily=processor.family)
         binary_package_build = BinaryPackageBuild(
             sourcepackagerelease=source_package_release,
             processor=processor,