Merge lp:~stevenk/launchpad/testfix-no-builder-description into lp:launchpad

Proposed by Steve Kowalik on 2012-05-30
Status: Merged
Approved by: Steve Kowalik on 2012-05-30
Approved revision: no longer in the source branch.
Merged at revision: 15326
Proposed branch: lp:~stevenk/launchpad/testfix-no-builder-description
Merge into: lp:launchpad
Diff against target: 33 lines (+3/-5)
1 file modified
lib/lp/soyuz/tests/test_hasbuildrecords.py (+3/-5)
To merge this branch: bzr merge lp:~stevenk/launchpad/testfix-no-builder-description
Reviewer Review Type Date Requested Status
Steve Kowalik (community) code Approve on 2012-05-30
Review via email: mp+107913@code.launchpad.net

Commit Message

Use the factory to create a builder in test_hasbuildrecords.

Description of the Change

Stop using IBuilderSet.new() to create builders. This better be the last vestiges of Builder.description, or I'm going to kick a puppy. A cute one.

To post a comment you must log in.
Steve Kowalik (stevenk) :
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/soyuz/tests/test_hasbuildrecords.py'
2--- lib/lp/soyuz/tests/test_hasbuildrecords.py 2012-05-14 04:49:00 +0000
3+++ lib/lp/soyuz/tests/test_hasbuildrecords.py 2012-05-30 05:44:19 +0000
4@@ -16,7 +16,6 @@
5 BuildFarmJobType,
6 BuildStatus,
7 )
8-from lp.buildmaster.interfaces.builder import IBuilderSet
9 from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
10 from lp.buildmaster.interfaces.packagebuild import IPackageBuildSource
11 from lp.registry.interfaces.person import IPersonSet
12@@ -221,10 +220,9 @@
13 owner = self.factory.makePerson()
14 processor_family = ProcessorFamilySet().getByProcessorName('386')
15 processor = processor_family.processors[0]
16- builder_set = getUtility(IBuilderSet)
17- self.context = builder_set.new(
18+ self.context = self.factory.makeBuilder(
19 processor, 'http://example.com', 'Newbob', 'New Bob the Builder',
20- 'A new and improved bob.', owner)
21+ owner=owner)
22
23 # Ensure that our builds were all built by the test builder.
24 for build in self.builds:
25@@ -350,7 +348,7 @@
26 publisher.prepareBreezyAutotest()
27 publisher.addFakeChroots(distroseries=distroseries)
28 distroseries.nominatedarchindep = das
29- builder = self.factory.makeBuilder(processor=pf_proc)
30+ self.factory.makeBuilder(processor=pf_proc)
31 spph = self.factory.makeSourcePackagePublishingHistory(
32 sourcepackagename=spn, distroseries=distroseries)
33 spph.createMissingBuilds()