Launchpad itself

Merge lp:~wgrant/launchpad/buildqueue-to-buildmaster into lp:launchpad

  1. buildqueue-to-buildmaster
  2. Merge into devel
Proposed by William Grant
Status: Merged
Approved by: Eleanor Berger
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~wgrant/launchpad/buildqueue-to-buildmaster
Merge into: lp:launchpad
Diff against target: 751 lines (+140/-143)
29 files modified
lib/canonical/launchpad/configure.zcml (+1/-0)
lib/canonical/launchpad/database/__init__.py (+0/-1)
lib/canonical/launchpad/interfaces/__init__.py (+0/-1)
lib/lp/buildmaster/configure.zcml (+67/-0)
lib/lp/buildmaster/doc/buildqueue.txt (+2/-2)
lib/lp/buildmaster/interfaces/buildbase.py (+1/-1)
lib/lp/buildmaster/master.py (+5/-8)
lib/lp/buildmaster/model/buildbase.py (+1/-1)
lib/lp/buildmaster/model/builder.py (+20/-24)
lib/lp/buildmaster/model/buildfarmjobbehavior.py (+1/-1)
lib/lp/buildmaster/model/buildqueue.py (+2/-2)
lib/lp/buildmaster/tests/test_builder.py (+2/-5)
lib/lp/buildmaster/tests/test_buildmaster_documentation.py (+5/-0)
lib/lp/buildmaster/tests/test_buildqueue.py (+2/-2)
lib/lp/buildmaster/tests/test_manager.py (+9/-9)
lib/lp/code/model/sourcepackagerecipebuild.py (+1/-1)
lib/lp/code/tests/test_sourcepackagerecipe.py (+2/-4)
lib/lp/code/tests/test_sourcepackagerecipebuild.py (+1/-1)
lib/lp/soyuz/browser/build.py (+8/-8)
lib/lp/soyuz/browser/tests/builder-views.txt (+1/-1)
lib/lp/soyuz/configure.zcml (+0/-60)
lib/lp/soyuz/doc/buildd-dispatching.txt (+1/-1)
lib/lp/soyuz/model/build.py (+1/-1)
lib/lp/soyuz/tests/test_build.py (+1/-2)
lib/lp/testing/factory.py (+1/-1)
lib/lp/translations/doc/translationtemplatesbuildbehavior.txt (+1/-1)
lib/lp/translations/model/translationtemplatesbuildjob.py (+1/-1)
lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py (+1/-2)
lib/lp/translations/tests/test_translationtemplatesbuildjob.py (+2/-2)
To merge this branch: bzr merge lp:~wgrant/launchpad/buildqueue-to-buildmaster
Reviewer Review Type Date Requested Status
Eleanor Berger (community) Approve
Review via email: mp+20886@code.launchpad.net

Commit message

Move (I)BuildQueue(Set) from lp.soyuz to lp.buildmaster.

Description of the change

This branch moves (I)BuildQueue(Set) from lp.soyuz to lp.buildmaster, where it belongs in the New World of multiple build types. Julian had no objections to this move.

It's a pretty straight move, with a bit of trivial lint fixing and some import sorting along the way. I've also moved the Builder-related ZCML to lp.buildmaster, since that was missed when the classes and interfaces were moved a couple of months ago.

To post a comment you must log in.
Revision history for this message
Eleanor Berger (intellectronica) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/launchpad/configure.zcml'
2--- lib/canonical/launchpad/configure.zcml 2010-02-24 23:18:40 +0000
3+++ lib/canonical/launchpad/configure.zcml 2010-03-08 21:22:31 +0000
4@@ -22,6 +22,7 @@
5
6 <include package="lp.app" />
7 <include package="lp.bugs" />
8+ <include package="lp.buildmaster" />
9 <include package="lp.registry" />
10 <include package="lp.answers" />
11 <include package="lp.coop.answersbugs" />
12
13=== modified file 'lib/canonical/launchpad/database/__init__.py'
14--- lib/canonical/launchpad/database/__init__.py 2010-02-16 20:36:48 +0000
15+++ lib/canonical/launchpad/database/__init__.py 2010-03-08 21:22:31 +0000
16@@ -22,7 +22,6 @@
17 from lp.soyuz.model.processor import *
18 from lp.soyuz.model.build import *
19 from lp.buildmaster.model.builder import *
20-from lp.soyuz.model.buildqueue import *
21 from lp.soyuz.model.publishing import *
22 from lp.soyuz.model.files import *
23 from lp.soyuz.model.queue import *
24
25=== modified file 'lib/canonical/launchpad/interfaces/__init__.py'
26--- lib/canonical/launchpad/interfaces/__init__.py 2010-02-17 11:19:42 +0000
27+++ lib/canonical/launchpad/interfaces/__init__.py 2010-03-08 21:22:31 +0000
28@@ -45,7 +45,6 @@
29 from lp.soyuz.interfaces.build import *
30 from lp.buildmaster.interfaces.builder import *
31 from lp.soyuz.interfaces.buildrecords import *
32-from lp.soyuz.interfaces.buildqueue import *
33 from lp.registry.interfaces.codeofconduct import *
34 from lp.registry.interfaces.commercialsubscription import *
35 from lp.soyuz.interfaces.component import *
36
37=== added file 'lib/lp/buildmaster/configure.zcml'
38--- lib/lp/buildmaster/configure.zcml 1970-01-01 00:00:00 +0000
39+++ lib/lp/buildmaster/configure.zcml 2010-03-08 21:22:31 +0000
40@@ -0,0 +1,67 @@
41+<!-- Copyright 2010 Canonical Ltd. This software is licensed under the
42+ GNU Affero General Public License version 3 (see the file LICENSE).
43+-->
44+
45+<configure
46+ xmlns="http://namespaces.zope.org/zope"
47+ xmlns:browser="http://namespaces.zope.org/browser"
48+ xmlns:i18n="http://namespaces.zope.org/i18n"
49+ xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc"
50+ i18n_domain="launchpad">
51+
52+
53+ <!-- Builder -->
54+ <class
55+ class="lp.buildmaster.model.builder.Builder">
56+ <allow
57+ interface="lp.buildmaster.interfaces.builder.IBuilder"/>
58+ <allow
59+ interface="lp.soyuz.interfaces.buildrecords.IHasBuildRecords"/>
60+ <require
61+ permission="launchpad.Edit"
62+ set_schema="lp.buildmaster.interfaces.builder.IBuilder"/>
63+ </class>
64+
65+
66+ <!-- BuilderSet -->
67+ <securedutility
68+ class="lp.buildmaster.model.builder.BuilderSet"
69+ provides="lp.buildmaster.interfaces.builder.IBuilderSet">
70+ <allow
71+ interface="lp.buildmaster.interfaces.builder.IBuilderSet"/>
72+ </securedutility>
73+ <adapter
74+ provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
75+ for="lp.buildmaster.interfaces.builder.IBuilder"
76+ factory="canonical.launchpad.webapp.breadcrumb.TitleBreadcrumb"
77+ permission="zope.Public"/>
78+ <adapter
79+ provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
80+ for="lp.buildmaster.interfaces.builder.IBuilderSet"
81+ factory="lp.soyuz.browser.builder.BuilderSetBreadcrumb"
82+ permission="zope.Public"/>
83+
84+
85+ <!-- BuildQueue -->
86+ <class
87+ class="lp.buildmaster.model.buildqueue.BuildQueue">
88+ <allow
89+ interface="lp.buildmaster.interfaces.buildqueue.IBuildQueue"/>
90+
91+ <!-- XXX cprov 2005-10-20 bug=3580:
92+ We need a autobuild celebrity. -->
93+ <!-- Grant permissions to write on BuildQueue and Build. -->
94+ <require
95+ permission="zope.Public"
96+ set_attributes="lastscore builder logtail date_started"/>
97+ </class>
98+
99+
100+ <!-- BuildQueueSet -->
101+ <securedutility
102+ class="lp.buildmaster.model.buildqueue.BuildQueueSet"
103+ provides="lp.buildmaster.interfaces.buildqueue.IBuildQueueSet">
104+ <allow
105+ interface="lp.buildmaster.interfaces.buildqueue.IBuildQueueSet"/>
106+ </securedutility>
107+</configure>
108
109=== renamed file 'lib/lp/soyuz/doc/buildqueue.txt' => 'lib/lp/buildmaster/doc/buildqueue.txt'
110--- lib/lp/soyuz/doc/buildqueue.txt 2010-01-20 01:23:38 +0000
111+++ lib/lp/buildmaster/doc/buildqueue.txt 2010-03-08 21:22:31 +0000
112@@ -13,8 +13,8 @@
113 collected) the BuildQueue record representing it is removed.
114
115 >>> from canonical.launchpad.webapp.testing import verifyObject
116- >>> from canonical.launchpad.interfaces import IBuildQueue
117- >>> from canonical.launchpad.interfaces import IBuildQueueSet
118+ >>> from lp.buildmaster.interfaces.buildqueue import (
119+ ... IBuildQueue, IBuildQueueSet)
120
121 Get an instance of Builder from the current sampledata using the
122 IBuildQueueSet zope utility. The zope utility itself will be
123
124=== modified file 'lib/lp/buildmaster/interfaces/buildbase.py'
125--- lib/lp/buildmaster/interfaces/buildbase.py 2010-03-08 11:10:06 +0000
126+++ lib/lp/buildmaster/interfaces/buildbase.py 2010-03-08 21:22:31 +0000
127@@ -16,10 +16,10 @@
128 from lazr.restful.fields import Reference
129
130 from lp.buildmaster.interfaces.builder import IBuilder
131+from lp.buildmaster.interfaces.buildqueue import IBuildQueue
132 from lp.registry.interfaces.distribution import IDistribution
133 from lp.registry.interfaces.pocket import PackagePublishingPocket
134 from lp.soyuz.interfaces.archive import IArchive
135-from lp.soyuz.interfaces.buildqueue import IBuildQueue
136 from canonical.launchpad.interfaces.librarian import ILibraryFileAlias
137 from canonical.launchpad import _
138
139
140=== renamed file 'lib/lp/soyuz/interfaces/buildqueue.py' => 'lib/lp/buildmaster/interfaces/buildqueue.py'
141=== modified file 'lib/lp/buildmaster/master.py'
142--- lib/lp/buildmaster/master.py 2010-03-04 16:12:33 +0000
143+++ lib/lp/buildmaster/master.py 2010-03-08 21:22:31 +0000
144@@ -18,17 +18,15 @@
145
146 from zope.component import getUtility
147
148+from canonical.buildd.utils import notes
149+from canonical.config import config
150 from canonical.librarian.interfaces import ILibrarianClient
151-
152-from lp.soyuz.interfaces.archive import ArchivePurpose
153-from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
154-from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
155-
156 from lp.archivepublisher.utils import process_in_batches
157-from canonical.buildd.utils import notes
158+from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
159 from lp.buildmaster.pas import BuildDaemonPackagesArchSpecific
160 from lp.buildmaster.buildergroup import BuilderGroup
161-from canonical.config import config
162+from lp.soyuz.interfaces.archive import ArchivePurpose
163+from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
164
165
166 def determineArchitecturesToBuild(pubrec, legal_archseries,
167@@ -280,7 +278,6 @@
168 "scanActiveBuilders() found %d active build(s) to check"
169 % queueItems.count())
170
171- build_set = getUtility(IBuildSet)
172 for job in queueItems:
173 job.builder.updateBuild(job)
174 self.commit()
175
176=== modified file 'lib/lp/buildmaster/model/buildbase.py'
177--- lib/lp/buildmaster/model/buildbase.py 2010-03-08 11:10:06 +0000
178+++ lib/lp/buildmaster/model/buildbase.py 2010-03-08 21:22:31 +0000
179@@ -29,10 +29,10 @@
180 from canonical.launchpad.helpers import filenameToContentType
181 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
182 from canonical.librarian.utils import copy_and_close
183+from lp.buildmaster.model.buildqueue import BuildQueue
184 from lp.buildmaster.interfaces.buildbase import BUILDD_MANAGER_LOG_NAME
185 from lp.registry.interfaces.pocket import pocketsuffix
186 from lp.soyuz.interfaces.build import BuildStatus
187-from lp.soyuz.model.buildqueue import BuildQueue
188
189
190 UPLOAD_LOG_FILENAME = 'uploader.log'
191
192=== modified file 'lib/lp/buildmaster/model/builder.py'
193--- lib/lp/buildmaster/model/builder.py 2010-03-04 16:12:33 +0000
194+++ lib/lp/buildmaster/model/builder.py 2010-03-08 21:22:31 +0000
195@@ -20,46 +20,42 @@
196 import urllib2
197 import xmlrpclib
198
199-from zope.interface import implements
200-from zope.component import getUtility
201-
202 from sqlobject import (
203- StringCol, ForeignKey, BoolCol, IntCol, SQLObjectNotFound)
204-
205+ BoolCol, ForeignKey, IntCol, SQLObjectNotFound, StringCol)
206 from storm.store import Store
207+from zope.component import getUtility
208+from zope.interface import implements
209
210 from canonical.cachedproperty import cachedproperty
211 from canonical.config import config
212 from canonical.buildd.slave import BuilderStatus
213+from canonical.launchpad.helpers import filenameToContentType
214+from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
215+from canonical.launchpad.webapp import urlappend
216+from canonical.launchpad.webapp.interfaces import NotFoundError
217+from canonical.launchpad.webapp.interfaces import (
218+ IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
219+from canonical.lazr.utils import safe_hasattr
220+from canonical.librarian.utils import copy_and_close
221+from lp.buildmaster.interfaces.builder import (
222+ BuildDaemonError, BuildSlaveFailure, CannotBuild, CannotFetchFile,
223+ CannotResumeHost, IBuilder, IBuilderSet, ProtocolVersionMismatch)
224 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
225 BuildBehaviorMismatch)
226+from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
227 from lp.buildmaster.master import BuilddMaster
228 from lp.buildmaster.model.buildfarmjobbehavior import IdleBuildBehavior
229+from lp.buildmaster.model.buildqueue import BuildQueue, specific_job_classes
230 from canonical.database.sqlbase import SQLBase, sqlvalues
231-
232-# XXX Michael Nelson 2010-01-13 bug=491330,506617
233-# These dependencies on soyuz will be removed when getBuildRecords()
234-# is moved, as well as when the generalisation of findBuildCandidate()
235-# is completed.
236-from lp.soyuz.model.buildqueue import BuildQueue, specific_job_classes
237 from lp.registry.interfaces.person import validate_public_person
238-from canonical.launchpad.helpers import filenameToContentType
239 from lp.services.job.interfaces.job import JobStatus
240+# XXX Michael Nelson 2010-01-13 bug=491330
241+# These dependencies on soyuz will be removed when getBuildRecords()
242+# is moved.
243+from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
244 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
245 from lp.soyuz.interfaces.distroarchseries import IDistroArchSeriesSet
246-from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
247-from canonical.launchpad.webapp.interfaces import NotFoundError
248-from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
249-from lp.buildmaster.interfaces.builder import (
250- BuildDaemonError, BuildSlaveFailure, CannotBuild, CannotFetchFile,
251- CannotResumeHost, IBuilder, IBuilderSet, ProtocolVersionMismatch)
252-from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
253 from lp.soyuz.model.buildpackagejob import BuildPackageJob
254-from canonical.launchpad.webapp import urlappend
255-from canonical.launchpad.webapp.interfaces import (
256- IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
257-from canonical.lazr.utils import safe_hasattr
258-from canonical.librarian.utils import copy_and_close
259
260
261 class TimeoutHTTPConnection(httplib.HTTPConnection):
262
263=== modified file 'lib/lp/buildmaster/model/buildfarmjobbehavior.py'
264--- lib/lp/buildmaster/model/buildfarmjobbehavior.py 2010-02-11 19:11:11 +0000
265+++ lib/lp/buildmaster/model/buildfarmjobbehavior.py 2010-03-08 21:22:31 +0000
266@@ -26,8 +26,8 @@
267 from lp.buildmaster.interfaces.builder import CorruptBuildID
268 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
269 BuildBehaviorMismatch, IBuildFarmJobBehavior)
270+from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
271 from lp.services.job.interfaces.job import JobStatus
272-from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
273
274
275 class BuildFarmJobBehaviorBase:
276
277=== renamed file 'lib/lp/soyuz/model/buildqueue.py' => 'lib/lp/buildmaster/model/buildqueue.py'
278--- lib/lp/soyuz/model/buildqueue.py 2010-02-26 16:07:32 +0000
279+++ lib/lp/buildmaster/model/buildqueue.py 2010-03-08 21:22:31 +0000
280@@ -31,10 +31,10 @@
281 BuildFarmJobType, IBuildFarmJob)
282 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
283 IBuildFarmJobBehavior)
284+from lp.buildmaster.interfaces.buildqueue import IBuildQueue, IBuildQueueSet
285 from lp.services.job.interfaces.job import JobStatus
286 from lp.services.job.model.job import Job
287 from lp.soyuz.interfaces.build import BuildStatus
288-from lp.soyuz.interfaces.buildqueue import IBuildQueue, IBuildQueueSet
289 from lp.soyuz.model.buildpackagejob import BuildPackageJob
290 from canonical.launchpad.webapp.interfaces import (
291 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
292@@ -71,7 +71,7 @@
293 GROUP BY processor, virtualized;
294 """
295 results = store.execute(builder_data).get_all()
296- builders_in_total = builders_for_job = virtualized_total = 0
297+ builders_in_total = virtualized_total = 0
298
299 builder_stats = defaultdict(int)
300 for processor, virtualized, count in results:
301
302=== modified file 'lib/lp/buildmaster/tests/test_builder.py'
303--- lib/lp/buildmaster/tests/test_builder.py 2010-02-19 12:07:39 +0000
304+++ lib/lp/buildmaster/tests/test_builder.py 2010-03-08 21:22:31 +0000
305@@ -12,18 +12,15 @@
306 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
307 from canonical.testing import LaunchpadZopelessLayer
308 from lp.buildmaster.interfaces.builder import IBuilderSet
309-from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
310 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
311 IBuildFarmJobBehavior)
312 from lp.buildmaster.model.buildfarmjobbehavior import IdleBuildBehavior
313-from lp.code.interfaces.sourcepackagerecipebuild import (
314- ISourcePackageRecipeBuildSource)
315+from lp.buildmaster.model.buildqueue import BuildQueue
316 from lp.soyuz.interfaces.archive import ArchivePurpose
317 from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
318 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
319 from lp.soyuz.model.binarypackagebuildbehavior import (
320 BinaryPackageBuildBehavior)
321-from lp.soyuz.model.buildqueue import BuildQueue
322 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
323 from lp.testing import TestCaseWithFactory
324
325@@ -79,7 +76,7 @@
326
327 # Make a new PPA and give it some builds.
328 self.ppa_joe = self.factory.makeArchive(name="joesppa")
329- builds = self.publisher.getPubSource(
330+ self.publisher.getPubSource(
331 sourcename="gedit", status=PackagePublishingStatus.PUBLISHED,
332 archive=self.ppa_joe).createMissingBuilds()
333
334
335=== modified file 'lib/lp/buildmaster/tests/test_buildmaster_documentation.py'
336--- lib/lp/buildmaster/tests/test_buildmaster_documentation.py 2010-01-12 17:55:46 +0000
337+++ lib/lp/buildmaster/tests/test_buildmaster_documentation.py 2010-03-08 21:22:31 +0000
338@@ -39,6 +39,11 @@
339 setUp=setUp, tearDown=tearDown,
340 layer=LaunchpadFunctionalLayer,
341 ),
342+ 'buildqueue.txt': LayeredDocFileSuite(
343+ '../doc/buildqueue.txt',
344+ setUp=setUp, tearDown=tearDown,
345+ layer=LaunchpadFunctionalLayer,
346+ ),
347 }
348
349 def test_suite():
350
351=== renamed file 'lib/lp/soyuz/tests/test_buildqueue.py' => 'lib/lp/buildmaster/tests/test_buildqueue.py'
352--- lib/lp/soyuz/tests/test_buildqueue.py 2010-03-08 10:47:56 +0000
353+++ lib/lp/buildmaster/tests/test_buildqueue.py 2010-03-08 21:22:31 +0000
354@@ -16,13 +16,13 @@
355
356 from lp.buildmaster.interfaces.builder import IBuilderSet
357 from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
358+from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
359 from lp.buildmaster.model.builder import specific_job_classes
360 from lp.buildmaster.model.buildfarmjob import BuildFarmJob
361+from lp.buildmaster.model.buildqueue import BuildQueue, get_builder_data
362 from lp.services.job.model.job import Job
363 from lp.soyuz.interfaces.archive import ArchivePurpose
364 from lp.soyuz.interfaces.build import BuildStatus
365-from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
366-from lp.soyuz.model.buildqueue import BuildQueue, get_builder_data
367 from lp.soyuz.model.processor import ProcessorFamilySet
368 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
369 from lp.soyuz.model.build import Build
370
371=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
372--- lib/lp/buildmaster/tests/test_manager.py 2010-01-21 08:53:21 +0000
373+++ lib/lp/buildmaster/tests/test_manager.py 2010-03-08 21:22:31 +0000
374@@ -18,20 +18,20 @@
375
376 from canonical.buildd.tests import BuilddSlaveTestSetup
377 from canonical.config import config
378+from canonical.launchpad.ftests import ANONYMOUS, login
379+from canonical.launchpad.scripts.logger import BufferLogger
380+from canonical.testing.layers import (
381+ LaunchpadScriptLayer, LaunchpadZopelessLayer, TwistedLayer)
382+from lp.buildmaster.interfaces.builder import IBuilderSet
383+from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
384 from lp.buildmaster.manager import (
385 BaseDispatchResult, BuilddManager, FailDispatchResult, RecordingSlave,
386 ResetDispatchResult, buildd_success_result_map)
387 from lp.buildmaster.tests.harness import BuilddManagerTestSetup
388-from canonical.launchpad.ftests import ANONYMOUS, login
389+from lp.registry.interfaces.distribution import IDistributionSet
390+from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
391 from lp.soyuz.tests.soyuzbuilddhelpers import SaneBuildingSlave
392-from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
393-from lp.buildmaster.interfaces.builder import IBuilderSet
394-from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
395-from lp.registry.interfaces.distribution import IDistributionSet
396-from canonical.launchpad.scripts.logger import BufferLogger
397 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
398-from canonical.testing.layers import (
399- LaunchpadScriptLayer, LaunchpadZopelessLayer, TwistedLayer)
400
401
402 class TestRecordingSlaves(TrialTestCase):
403@@ -482,7 +482,7 @@
404 test_publisher = SoyuzTestPublisher()
405 ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
406 hoary = ubuntu.getSeries('hoary')
407- unused = test_publisher.setUpDefaultDistroSeries(hoary)
408+ test_publisher.setUpDefaultDistroSeries(hoary)
409 test_publisher.addFakeChroots()
410 login(ANONYMOUS)
411
412
413=== modified file 'lib/lp/code/model/sourcepackagerecipebuild.py'
414--- lib/lp/code/model/sourcepackagerecipebuild.py 2010-02-19 06:34:18 +0000
415+++ lib/lp/code/model/sourcepackagerecipebuild.py 2010-03-08 21:22:31 +0000
416@@ -24,6 +24,7 @@
417 from lp.buildmaster.interfaces.buildbase import IBuildBase
418 from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
419 from lp.buildmaster.model.buildbase import BuildBase
420+from lp.buildmaster.model.buildqueue import BuildQueue
421 from lp.buildmaster.model.packagebuildfarmjob import PackageBuildFarmJob
422 from lp.code.interfaces.sourcepackagerecipebuild import (
423 ISourcePackageRecipeBuildJob, ISourcePackageRecipeBuildJobSource,
424@@ -34,7 +35,6 @@
425 default_component_dependency_name,)
426 from lp.soyuz.interfaces.build import BuildStatus
427 from lp.soyuz.interfaces.component import IComponentSet
428-from lp.soyuz.model.buildqueue import BuildQueue
429 from lp.soyuz.model.sourcepackagerelease import SourcePackageRelease
430
431
432
433=== modified file 'lib/lp/code/tests/test_sourcepackagerecipe.py'
434--- lib/lp/code/tests/test_sourcepackagerecipe.py 2010-02-05 15:06:28 +0000
435+++ lib/lp/code/tests/test_sourcepackagerecipe.py 2010-03-08 21:22:31 +0000
436@@ -20,13 +20,13 @@
437
438 from lp.archiveuploader.permission import (
439 ArchiveDisabled, CannotUploadToArchive, InvalidPocketForPPA)
440+from lp.buildmaster.interfaces.buildqueue import IBuildQueue
441+from lp.buildmaster.model.buildqueue import BuildQueue
442 from lp.code.interfaces.sourcepackagerecipe import (
443 ForbiddenInstruction, ISourcePackageRecipe, ISourcePackageRecipeSource,
444 TooNewRecipeFormat)
445 from lp.code.interfaces.sourcepackagerecipebuild import (
446 ISourcePackageRecipeBuild, ISourcePackageRecipeBuildJob)
447-from lp.soyuz.model.buildqueue import (
448- BuildQueue)
449 from lp.code.model.sourcepackagerecipebuild import (
450 SourcePackageRecipeBuildJob)
451 from lp.code.model.sourcepackagerecipe import (
452@@ -35,8 +35,6 @@
453 from lp.services.job.interfaces.job import (
454 IJob, JobStatus)
455 from lp.soyuz.interfaces.archive import ArchivePurpose
456-from lp.soyuz.interfaces.buildqueue import (
457- IBuildQueue)
458 from lp.testing import login_person, TestCaseWithFactory
459
460
461
462=== modified file 'lib/lp/code/tests/test_sourcepackagerecipebuild.py'
463--- lib/lp/code/tests/test_sourcepackagerecipebuild.py 2010-02-05 15:06:28 +0000
464+++ lib/lp/code/tests/test_sourcepackagerecipebuild.py 2010-03-08 21:22:31 +0000
465@@ -14,10 +14,10 @@
466 from canonical.testing.layers import DatabaseFunctionalLayer
467
468 from lp.buildmaster.interfaces.buildbase import IBuildBase
469+from lp.buildmaster.interfaces.buildqueue import IBuildQueue
470 from lp.code.interfaces.sourcepackagerecipebuild import (
471 ISourcePackageRecipeBuildJob, ISourcePackageRecipeBuild,
472 ISourcePackageRecipeBuildSource)
473-from lp.soyuz.interfaces.buildqueue import IBuildQueue
474 from lp.testing import TestCaseWithFactory
475
476
477
478=== modified file 'lib/lp/soyuz/browser/build.py'
479--- lib/lp/soyuz/browser/build.py 2010-02-24 13:39:16 +0000
480+++ lib/lp/soyuz/browser/build.py 2010-03-08 21:22:31 +0000
481@@ -14,6 +14,7 @@
482 'BuildView',
483 ]
484
485+from lazr.delegates import delegates
486 from zope.component import getUtility
487 from zope.interface import implements
488
489@@ -21,13 +22,6 @@
490 from canonical.launchpad import _
491 from canonical.launchpad.browser.librarian import (
492 FileNavigationMixin, ProxiedLibraryFileAlias)
493-from canonical.lazr.utils import safe_hasattr
494-from lp.soyuz.interfaces.build import (
495- BuildStatus, IBuild, IBuildRescoreForm)
496-from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
497-from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
498-from canonical.launchpad.interfaces.launchpad import UnexpectedFormData
499-from lp.soyuz.interfaces.queue import PackageUploadStatus
500 from canonical.launchpad.webapp import (
501 action, canonical_url, enabled_with_permission, ContextMenu,
502 GetitemNavigation, Link, LaunchpadFormView, LaunchpadView,
503@@ -35,8 +29,14 @@
504 from canonical.launchpad.webapp.authorization import check_permission
505 from canonical.launchpad.webapp.batching import BatchNavigator
506 from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
507-from lazr.delegates import delegates
508+from canonical.lazr.utils import safe_hasattr
509+from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
510 from lp.services.job.interfaces.job import JobStatus
511+from lp.soyuz.interfaces.build import (
512+ BuildStatus, IBuild, IBuildRescoreForm)
513+from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
514+from canonical.launchpad.interfaces.launchpad import UnexpectedFormData
515+from lp.soyuz.interfaces.queue import PackageUploadStatus
516
517
518 class BuildUrl:
519
520=== modified file 'lib/lp/soyuz/browser/tests/builder-views.txt'
521--- lib/lp/soyuz/browser/tests/builder-views.txt 2010-02-22 13:23:24 +0000
522+++ lib/lp/soyuz/browser/tests/builder-views.txt 2010-03-08 21:22:31 +0000
523@@ -129,7 +129,7 @@
524 Before checking if it works as expected we will setup an environment
525 where builder 'Frog' is building a job from Celso's private PPA.
526
527- >>> from lp.soyuz.model.buildqueue import BuildQueue
528+ >>> from lp.buildmaster.model.buildqueue import BuildQueue
529 >>> from canonical.launchpad.interfaces import (
530 ... IBuilderSet, IPersonSet)
531
532
533=== modified file 'lib/lp/soyuz/configure.zcml'
534--- lib/lp/soyuz/configure.zcml 2010-02-26 16:00:58 +0000
535+++ lib/lp/soyuz/configure.zcml 2010-03-08 21:22:31 +0000
536@@ -518,66 +518,6 @@
537 interface="lp.soyuz.interfaces.build.IBuildSet"/>
538 </securedutility>
539
540- <!-- BuilderSet -->
541-
542- <securedutility
543- class="canonical.launchpad.database.BuilderSet"
544- provides="lp.buildmaster.interfaces.builder.IBuilderSet">
545- <allow
546- interface="lp.buildmaster.interfaces.builder.IBuilderSet"/>
547- </securedutility>
548- <adapter
549- provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
550- for="lp.buildmaster.interfaces.builder.IBuilder"
551- factory="canonical.launchpad.webapp.breadcrumb.TitleBreadcrumb"
552- permission="zope.Public"/>
553- <adapter
554- provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
555- for="lp.buildmaster.interfaces.builder.IBuilderSet"
556- factory="lp.soyuz.browser.builder.BuilderSetBreadcrumb"
557- permission="zope.Public"/>
558-
559- <!-- Builder -->
560-
561- <class
562- class="canonical.launchpad.database.Builder">
563- <allow
564- interface="lp.buildmaster.interfaces.builder.IBuilder"/>
565- <allow
566- interface="canonical.launchpad.interfaces.IHasBuildRecords"/>
567- <require
568- permission="launchpad.Edit"
569- set_schema="lp.buildmaster.interfaces.builder.IBuilder"/>
570- </class>
571-
572- <!-- BuildQueue -->
573-
574- <class
575- class="canonical.launchpad.database.BuildQueue">
576- <allow
577- interface="canonical.launchpad.interfaces.IBuildQueue"/>
578-
579- <!-- XXX cprov 2005-10-20
580-
581- bug=3580: We need a autobuild celebrity. -->
582-
583-
584- <!-- Grant permissions to write on BuildQueue and Build. -->
585-
586- <require
587- permission="zope.Public"
588- set_attributes="lastscore builder logtail date_started"/>
589- </class>
590-
591- <!-- BuildQueueSet -->
592-
593- <securedutility
594- class="canonical.launchpad.database.BuildQueueSet"
595- provides="canonical.launchpad.interfaces.IBuildQueueSet">
596- <allow
597- interface="canonical.launchpad.interfaces.IBuildQueueSet"/>
598- </securedutility>
599-
600 <!-- DistroArchSeriesBinaryPackage -->
601
602 <class
603
604=== modified file 'lib/lp/soyuz/doc/buildd-dispatching.txt'
605--- lib/lp/soyuz/doc/buildd-dispatching.txt 2010-01-20 01:23:38 +0000
606+++ lib/lp/soyuz/doc/buildd-dispatching.txt 2010-03-08 21:22:31 +0000
607@@ -61,7 +61,7 @@
608
609 Clean up previous BuildQueue results from sampledata:
610
611- >>> from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
612+ >>> from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
613 >>> lost_job = getUtility(IBuildQueueSet).get(1)
614 >>> lost_job.builder.name
615 u'bob'
616
617=== modified file 'lib/lp/soyuz/model/build.py'
618--- lib/lp/soyuz/model/build.py 2010-02-16 02:27:24 +0000
619+++ lib/lp/soyuz/model/build.py 2010-03-08 21:22:31 +0000
620@@ -43,6 +43,7 @@
621 from lp.archivepublisher.utils import get_ppa_reference
622 from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
623 from lp.buildmaster.model.buildbase import BuildBase
624+from lp.buildmaster.model.buildqueue import BuildQueue
625 from lp.registry.interfaces.pocket import PackagePublishingPocket
626 from lp.services.job.model.job import Job
627 from lp.soyuz.adapters.archivedependencies import get_components_for_building
628@@ -54,7 +55,6 @@
629 from lp.soyuz.model.binarypackagerelease import BinaryPackageRelease
630 from lp.buildmaster.model.builder import Builder
631 from lp.soyuz.model.buildpackagejob import BuildPackageJob
632-from lp.soyuz.model.buildqueue import BuildQueue
633 from lp.soyuz.model.files import BinaryPackageFile
634 from lp.soyuz.model.publishing import SourcePackagePublishingHistory
635 from lp.soyuz.model.queue import (
636
637=== modified file 'lib/lp/soyuz/tests/test_build.py'
638--- lib/lp/soyuz/tests/test_build.py 2010-02-15 21:33:26 +0000
639+++ lib/lp/soyuz/tests/test_build.py 2010-03-08 21:22:31 +0000
640@@ -8,7 +8,6 @@
641 import unittest
642
643 from storm.store import Store
644-import transaction
645 from zope.component import getUtility
646
647 from canonical.database.constants import UTC_NOW
648@@ -16,10 +15,10 @@
649 from lp.services.job.model.job import Job
650 from lp.buildmaster.interfaces.buildbase import IBuildBase
651 from lp.buildmaster.interfaces.builder import IBuilderSet
652+from lp.buildmaster.model.buildqueue import BuildQueue
653 from lp.soyuz.interfaces.component import IComponentSet
654 from lp.soyuz.interfaces.build import BuildStatus, IBuild, IBuildSet
655 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
656-from lp.soyuz.model.buildqueue import BuildQueue
657 from lp.soyuz.model.buildpackagejob import BuildPackageJob
658 from lp.soyuz.model.processor import ProcessorFamilySet
659 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
660
661=== modified file 'lib/lp/testing/factory.py'
662--- lib/lp/testing/factory.py 2010-03-06 21:18:11 +0000
663+++ lib/lp/testing/factory.py 2010-03-08 21:22:31 +0000
664@@ -69,6 +69,7 @@
665 from lp.bugs.interfaces.bugwatch import IBugWatchSet
666 from lp.buildmaster.interfaces.builder import IBuilderSet
667 from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
668+from lp.buildmaster.model.buildqueue import BuildQueue
669
670 from lp.code.enums import (
671 BranchMergeProposalStatus, BranchSubscriptionNotificationLevel,
672@@ -129,7 +130,6 @@
673 from lp.soyuz.interfaces.processor import IProcessorFamilySet
674 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
675 from lp.soyuz.interfaces.section import ISectionSet
676-from lp.soyuz.model.buildqueue import BuildQueue
677 from lp.soyuz.model.processor import ProcessorFamilySet
678 from lp.soyuz.model.publishing import SourcePackagePublishingHistory
679
680
681=== modified file 'lib/lp/translations/doc/translationtemplatesbuildbehavior.txt'
682--- lib/lp/translations/doc/translationtemplatesbuildbehavior.txt 2010-01-13 20:48:37 +0000
683+++ lib/lp/translations/doc/translationtemplatesbuildbehavior.txt 2010-03-08 21:22:31 +0000
684@@ -47,9 +47,9 @@
685 Use the ITranslationTemplatesBuildJobSource to create a
686 TranslationTemplatesBuildJob.
687
688+ >>> from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
689 >>> from lp.translations.interfaces.translationtemplatesbuildjob import (
690 ... ITranslationTemplatesBuildJobSource)
691- >>> from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
692 >>> branch = factory.makeBranch()
693 >>> specific_job_source = getUtility(ITranslationTemplatesBuildJobSource)
694 >>> specific_job = specific_job_source.create(branch)
695
696=== modified file 'lib/lp/translations/model/translationtemplatesbuildjob.py'
697--- lib/lp/translations/model/translationtemplatesbuildjob.py 2010-03-02 17:44:45 +0000
698+++ lib/lp/translations/model/translationtemplatesbuildjob.py 2010-03-08 21:22:31 +0000
699@@ -21,9 +21,9 @@
700 from lp.buildmaster.interfaces.buildfarmjob import (
701 BuildFarmJobType, IBuildFarmJob, ISpecificBuildFarmJobClass)
702 from lp.buildmaster.model.buildfarmjob import BuildFarmJob
703+from lp.buildmaster.model.buildqueue import BuildQueue
704 from lp.code.interfaces.branchjob import IBranchJob, IRosettaUploadJobSource
705 from lp.code.model.branchjob import BranchJob, BranchJobDerived, BranchJobType
706-from lp.soyuz.model.buildqueue import BuildQueue
707 from lp.translations.interfaces.translationtemplatesbuildjob import (
708 ITranslationTemplatesBuildJobSource)
709 from lp.translations.pottery.detect_intltool import is_intltool_structure
710
711=== modified file 'lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py'
712--- lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py 2010-02-19 23:45:33 +0000
713+++ lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py 2010-03-08 21:22:31 +0000
714@@ -16,8 +16,8 @@
715 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
716 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
717 IBuildFarmJobBehavior)
718+from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
719 from lp.soyuz.interfaces.build import BuildStatus
720-from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
721 from lp.testing import TestCaseWithFactory
722 from lp.testing.fakemethod import FakeMethod
723
724@@ -149,7 +149,6 @@
725 queue_item = FakeBuildQueue(behavior)
726 slave_status = behavior._builder.slave.status
727 builder = behavior._builder
728- slave = builder.slave
729
730 behavior.dispatchBuildToSlave(queue_item, logging)
731
732
733=== modified file 'lib/lp/translations/tests/test_translationtemplatesbuildjob.py'
734--- lib/lp/translations/tests/test_translationtemplatesbuildjob.py 2010-03-02 17:44:45 +0000
735+++ lib/lp/translations/tests/test_translationtemplatesbuildjob.py 2010-03-08 21:22:31 +0000
736@@ -22,13 +22,13 @@
737 IBuildFarmJob, ISpecificBuildFarmJobClass)
738 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
739 IBuildFarmJobBehavior)
740+from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
741+from lp.buildmaster.model.buildqueue import BuildQueue
742 from lp.code.interfaces.branchjob import IBranchJob
743 from lp.code.model.branchjob import BranchJob
744 from lp.code.model.directbranchcommit import DirectBranchCommit
745 from lp.codehosting.scanner import events
746 from lp.services.job.model.job import Job
747-from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
748-from lp.soyuz.model.buildqueue import BuildQueue
749 from lp.translations.interfaces.translations import (
750 TranslationsBranchImportMode)
751 from lp.translations.interfaces.translationtemplatesbuildjob import (