Launchpad itself

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

  1. no-default-powerpc
  2. Merge into devel
Proposed by Aaron Bentley
Status: Merged
Merged at revision: 10833
Proposed branch: lp:~abentley/launchpad/no-default-powerpc
Merge into: lp:launchpad
Prerequisite: lp:~abentley/launchpad/recipe-build-index
Diff against target: 53 lines (+5/-7)
3 files modified
lib/lp/code/browser/tests/test_sourcepackagerecipe.py (+2/-2)
lib/lp/code/interfaces/sourcepackagerecipebuild.py (+1/-2)
lib/lp/testing/factory.py (+2/-3)
To merge this branch: bzr merge lp:~abentley/launchpad/no-default-powerpc
Reviewer Review Type Date Requested Status
Paul Hummer (community) code Approve
Review via email: mp+24855@code.launchpad.net

Commit message

Cleanups from recipe-build-index.

Description of the change

= 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

To post a comment you must log in.
Revision history for this message
Paul Hummer (rockstar) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
2--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py 2010-05-07 13:47:27 +0000
3+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py 2010-05-07 13:47:29 +0000
4@@ -429,8 +429,8 @@
5 my-recipe
6 Build status
7 Successfully built
8- Started on 2008-12-31
9- Finished on 2009-01-01
10+ Started on .*
11+ Finished on .*
12 \(took 1 minute, 0.0 seconds\)
13 buildlog \(8 bytes\)
14 uploadlog \(10 bytes\)
15
16=== modified file 'lib/lp/code/interfaces/sourcepackagerecipebuild.py'
17--- lib/lp/code/interfaces/sourcepackagerecipebuild.py 2010-05-07 13:47:27 +0000
18+++ lib/lp/code/interfaces/sourcepackagerecipebuild.py 2010-05-07 13:47:29 +0000
19@@ -40,8 +40,7 @@
20
21 binary_builds = CollectionField(
22 Reference(IBinaryPackageBuild),
23- title=_("The binary builds that resulted from this."),
24- readonly=True)
25+ title=_("The binary builds that resulted from this."), readonly=True)
26
27 datestarted = Datetime(title=u'The time the build started.')
28
29
30=== renamed file 'lib/lp/code/tests/test_recipebuilder.py' => 'lib/lp/code/model/tests/test_recipebuilder.py'
31=== renamed file 'lib/lp/code/tests/test_sourcepackagerecipebuild.py' => 'lib/lp/code/model/tests/test_sourcepackagerecipebuild.py'
32=== modified file 'lib/lp/testing/factory.py'
33--- lib/lp/testing/factory.py 2010-05-07 13:47:27 +0000
34+++ lib/lp/testing/factory.py 2010-05-07 13:47:29 +0000
35@@ -1626,7 +1626,7 @@
36 makeDistroSeries = makeDistroRelease
37
38 def makeDistroArchSeries(self, distroseries=None,
39- architecturetag='powerpc', processorfamily=None,
40+ architecturetag=None, processorfamily=None,
41 official=True, owner=None,
42 supports_virtualized=False):
43 """Create a new distroarchseries"""
44@@ -2171,8 +2171,7 @@
45 if distroarchseries is None:
46 distroarchseries = self.makeDistroArchSeries(
47 distroseries=source_package_release.upload_distroseries,
48- processorfamily=processor.family,
49- architecturetag=None)
50+ processorfamily=processor.family)
51 binary_package_build = BinaryPackageBuild(
52 sourcepackagerelease=source_package_release,
53 processor=processor,