Launchpad itself

Merge lp:~jelmer/launchpad/buildmaster-enums into lp:launchpad

  1. buildmaster-enums
  2. Merge into devel
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Brad Crittenden
Approved revision: no longer in the source branch.
Merged at revision: 11471
Proposed branch: lp:~jelmer/launchpad/buildmaster-enums
Merge into: lp:launchpad
Diff against target: 1481 lines (+244/-234)
87 files modified
lib/canonical/launchpad/doc/tales.txt (+1/-1)
lib/canonical/launchpad/interfaces/_schema_circular_imports.py (+1/-1)
lib/canonical/launchpad/webapp/tales.py (+1/-1)
lib/lp/archiveuploader/dscfile.py (+1/-1)
lib/lp/archiveuploader/nascentuploadfile.py (+1/-1)
lib/lp/archiveuploader/tests/test_recipeuploads.py (+1/-1)
lib/lp/archiveuploader/tests/test_uploadprocessor.py (+1/-1)
lib/lp/archiveuploader/uploadprocessor.py (+1/-1)
lib/lp/buildmaster/doc/buildfarmjob.txt (+2/-1)
lib/lp/buildmaster/enums.py (+133/-0)
lib/lp/buildmaster/interfaces/buildbase.py (+0/-101)
lib/lp/buildmaster/interfaces/buildfarmjob.py (+1/-34)
lib/lp/buildmaster/interfaces/buildqueue.py (+1/-1)
lib/lp/buildmaster/interfaces/packagebuild.py (+1/-1)
lib/lp/buildmaster/manager.py (+4/-1)
lib/lp/buildmaster/model/buildfarmjob.py (+2/-2)
lib/lp/buildmaster/model/buildqueue.py (+1/-1)
lib/lp/buildmaster/model/packagebuild.py (+2/-5)
lib/lp/buildmaster/tests/test_builder.py (+1/-1)
lib/lp/buildmaster/tests/test_buildfarmjob.py (+4/-2)
lib/lp/buildmaster/tests/test_buildfarmjobbehavior.py (+1/-1)
lib/lp/buildmaster/tests/test_buildqueue.py (+5/-5)
lib/lp/buildmaster/tests/test_manager.py (+1/-1)
lib/lp/buildmaster/tests/test_packagebuild.py (+4/-2)
lib/lp/code/browser/sourcepackagerecipebuild.py (+1/-1)
lib/lp/code/browser/tests/test_sourcepackagerecipe.py (+1/-1)
lib/lp/code/browser/tests/test_sourcepackagerecipebuild.py (+1/-1)
lib/lp/code/mail/tests/test_sourcepackagerecipebuild.py (+1/-1)
lib/lp/code/model/sourcepackagerecipe.py (+1/-1)
lib/lp/code/model/sourcepackagerecipebuild.py (+4/-2)
lib/lp/code/model/tests/test_recipebuilder.py (+1/-1)
lib/lp/code/model/tests/test_sourcepackagerecipe.py (+1/-1)
lib/lp/code/model/tests/test_sourcepackagerecipebuild.py (+1/-1)
lib/lp/registry/browser/person.py (+1/-1)
lib/lp/registry/browser/tests/test_person_view.py (+1/-1)
lib/lp/registry/model/sourcepackage.py (+1/-1)
lib/lp/soyuz/browser/archive.py (+1/-1)
lib/lp/soyuz/browser/build.py (+1/-1)
lib/lp/soyuz/browser/tests/archive-views.txt (+1/-1)
lib/lp/soyuz/browser/tests/build-views.txt (+1/-1)
lib/lp/soyuz/browser/tests/builder-views.txt (+1/-1)
lib/lp/soyuz/doc/archive.txt (+1/-1)
lib/lp/soyuz/doc/binarypackagebuild.txt (+1/-1)
lib/lp/soyuz/doc/build-estimated-dispatch-time.txt (+1/-1)
lib/lp/soyuz/doc/build-notification.txt (+1/-1)
lib/lp/soyuz/doc/buildd-dispatching.txt (+1/-1)
lib/lp/soyuz/doc/buildd-slavescanner.txt (+1/-1)
lib/lp/soyuz/doc/hasbuildrecords.txt (+1/-1)
lib/lp/soyuz/doc/packageupload-lookups.txt (+1/-1)
lib/lp/soyuz/doc/publishing.txt (+1/-1)
lib/lp/soyuz/doc/queuebuilder.txt (+1/-1)
lib/lp/soyuz/doc/sourcepackagerelease-build-lookup.txt (+1/-1)
lib/lp/soyuz/doc/soyuz-set-of-uploads.txt (+1/-1)
lib/lp/soyuz/interfaces/binarypackagebuild.py (+1/-1)
lib/lp/soyuz/model/archive.py (+1/-1)
lib/lp/soyuz/model/binarypackagebuild.py (+4/-2)
lib/lp/soyuz/model/buildfarmbuildjob.py (+1/-1)
lib/lp/soyuz/model/buildpackagejob.py (+1/-1)
lib/lp/soyuz/model/publishing.py (+1/-1)
lib/lp/soyuz/model/sourcepackagerelease.py (+1/-1)
lib/lp/soyuz/scripts/buildd.py (+1/-1)
lib/lp/soyuz/scripts/gina/handlers.py (+1/-1)
lib/lp/soyuz/scripts/initialise_distroseries.py (+1/-1)
lib/lp/soyuz/scripts/packagecopier.py (+1/-1)
lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py (+1/-1)
lib/lp/soyuz/scripts/tests/test_copypackage.py (+1/-1)
lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py (+1/-1)
lib/lp/soyuz/scripts/tests/test_populatearchive.py (+1/-1)
lib/lp/soyuz/stories/ppa/xx-copy-packages.txt (+1/-1)
lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt (+1/-1)
lib/lp/soyuz/stories/soyuz/xx-build-record.txt (+1/-1)
lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt (+1/-1)
lib/lp/soyuz/stories/webservice/xx-builds.txt (+1/-1)
lib/lp/soyuz/tests/test_archive.py (+1/-1)
lib/lp/soyuz/tests/test_binarypackagebuild.py (+1/-1)
lib/lp/soyuz/tests/test_buildpackagejob.py (+1/-1)
lib/lp/soyuz/tests/test_copyarchivejob.py (+1/-1)
lib/lp/soyuz/tests/test_hasbuildrecords.py (+2/-2)
lib/lp/soyuz/tests/test_packagecloner.py (+1/-1)
lib/lp/soyuz/tests/test_packageupload.py (+1/-1)
lib/lp/soyuz/tests/test_publishing.py (+1/-1)
lib/lp/soyuz/tests/test_publishing_models.py (+1/-1)
lib/lp/testing/factory.py (+4/-2)
lib/lp/testing/tests/test_factory.py (+1/-1)
lib/lp/translations/model/translationtemplatesbuildjob.py (+1/-1)
lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py (+1/-1)
scripts/ftpmaster-tools/buildd-mass-retry.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/launchpad/buildmaster-enums
Reviewer Review Type Date Requested Status
Brad Crittenden (community) code Approve
Review via email: mp+33893@code.launchpad.net

Commit message

Move enums in buildmaster to lp.buildmaster.

Description of the change

Some trivial refactoring.

Move enums inside of the buildd manager to lp.buildmaster.enums. Remove the remainder of lib/lp/buildmanager/interfaces/buildbase.py

To post a comment you must log in.
Revision history for this message
Brad Crittenden (bac) wrote :

Nice, big, boring branch Jelmer. Thanks for doing it.

We talked about the local import. Fix it if you can with minimal fuss.

Also, many place you have:

+from lp.buildmaster.enums import (
+ BuildStatus,
+ BuildFarmJobType,
+ )

which needs to be reordered for proper alphabetizing.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/launchpad/doc/tales.txt'
2--- lib/canonical/launchpad/doc/tales.txt 2010-08-24 11:31:13 +0000
3+++ lib/canonical/launchpad/doc/tales.txt 2010-08-30 02:12:47 +0000
4@@ -197,7 +197,7 @@
5
6 The 'building' build is 14x14:
7
8- >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
9+ >>> from lp.buildmaster.enums import BuildStatus
10 >>> from zope.security.proxy import removeSecurityProxy
11 >>> removeSecurityProxy(build).status = BuildStatus.BUILDING
12 >>> print test_tales("build/image:icon", build=build)
13
14=== modified file 'lib/canonical/launchpad/interfaces/_schema_circular_imports.py'
15--- lib/canonical/launchpad/interfaces/_schema_circular_imports.py 2010-08-24 15:29:01 +0000
16+++ lib/canonical/launchpad/interfaces/_schema_circular_imports.py 2010-08-30 02:12:47 +0000
17@@ -47,7 +47,7 @@
18 from lp.bugs.interfaces.bugtask import IBugTask
19 from lp.bugs.interfaces.bugtracker import IBugTracker
20 from lp.bugs.interfaces.bugwatch import IBugWatch
21-from lp.buildmaster.interfaces.buildbase import BuildStatus
22+from lp.buildmaster.enums import BuildStatus
23 from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
24 from lp.buildmaster.interfaces.buildqueue import IBuildQueue
25 from lp.code.interfaces.branch import IBranch
26
27=== modified file 'lib/canonical/launchpad/webapp/tales.py'
28--- lib/canonical/launchpad/webapp/tales.py 2010-08-23 16:51:11 +0000
29+++ lib/canonical/launchpad/webapp/tales.py 2010-08-30 02:12:47 +0000
30@@ -58,7 +58,7 @@
31 from canonical.lazr.canonicalurl import nearest_adapter
32 from lp.app.browser.stringformatter import escape, FormattersAPI
33 from lp.blueprints.interfaces.specification import ISpecification
34-from lp.buildmaster.interfaces.buildbase import BuildStatus
35+from lp.buildmaster.enums import BuildStatus
36 from lp.code.interfaces.branch import IBranch
37 from lp.soyuz.enums import ArchivePurpose
38 from lp.soyuz.interfaces.archive import IPPA
39
40=== modified file 'lib/lp/archiveuploader/dscfile.py'
41--- lib/lp/archiveuploader/dscfile.py 2010-08-25 11:01:59 +0000
42+++ lib/lp/archiveuploader/dscfile.py 2010-08-30 02:12:47 +0000
43@@ -58,7 +58,7 @@
44 re_valid_version,
45 safe_fix_maintainer,
46 )
47-from lp.buildmaster.interfaces.buildbase import BuildStatus
48+from lp.buildmaster.enums import BuildStatus
49 from lp.code.interfaces.sourcepackagerecipebuild import (
50 ISourcePackageRecipeBuildSource,
51 )
52
53=== modified file 'lib/lp/archiveuploader/nascentuploadfile.py'
54--- lib/lp/archiveuploader/nascentuploadfile.py 2010-08-26 08:02:08 +0000
55+++ lib/lp/archiveuploader/nascentuploadfile.py 2010-08-30 02:12:47 +0000
56@@ -44,7 +44,7 @@
57 re_valid_pkg_name,
58 re_valid_version,
59 )
60-from lp.buildmaster.interfaces.buildbase import BuildStatus
61+from lp.buildmaster.enums import BuildStatus
62 from lp.soyuz.enums import (
63 BinaryPackageFormat,
64 PackagePublishingPriority,
65
66=== modified file 'lib/lp/archiveuploader/tests/test_recipeuploads.py'
67--- lib/lp/archiveuploader/tests/test_recipeuploads.py 2010-08-24 12:25:48 +0000
68+++ lib/lp/archiveuploader/tests/test_recipeuploads.py 2010-08-30 02:12:47 +0000
69@@ -13,7 +13,7 @@
70 from lp.archiveuploader.tests.test_uploadprocessor import (
71 TestUploadProcessorBase,
72 )
73-from lp.buildmaster.interfaces.buildbase import BuildStatus
74+from lp.buildmaster.enums import BuildStatus
75 from lp.code.interfaces.sourcepackagerecipebuild import (
76 ISourcePackageRecipeBuildSource,
77 )
78
79=== modified file 'lib/lp/archiveuploader/tests/test_uploadprocessor.py'
80--- lib/lp/archiveuploader/tests/test_uploadprocessor.py 2010-08-24 13:56:22 +0000
81+++ lib/lp/archiveuploader/tests/test_uploadprocessor.py 2010-08-30 02:12:47 +0000
82@@ -41,7 +41,7 @@
83 parse_build_upload_leaf_name,
84 UploadProcessor,
85 )
86-from lp.buildmaster.interfaces.buildbase import BuildStatus
87+from lp.buildmaster.enums import BuildStatus
88 from lp.registry.interfaces.distribution import IDistributionSet
89 from lp.registry.interfaces.person import IPersonSet
90 from lp.registry.interfaces.pocket import PackagePublishingPocket
91
92=== modified file 'lib/lp/archiveuploader/uploadprocessor.py'
93--- lib/lp/archiveuploader/uploadprocessor.py 2010-08-20 20:31:18 +0000
94+++ lib/lp/archiveuploader/uploadprocessor.py 2010-08-30 02:12:47 +0000
95@@ -74,7 +74,7 @@
96 SOURCE_PACKAGE_RECIPE_UPLOAD_POLICY_NAME,
97 UploadPolicyError,
98 )
99-from lp.buildmaster.interfaces.buildbase import BuildStatus
100+from lp.buildmaster.enums import BuildStatus
101 from lp.registry.interfaces.distribution import IDistributionSet
102 from lp.registry.interfaces.person import IPersonSet
103 from lp.soyuz.interfaces.archive import (
104
105=== modified file 'lib/lp/buildmaster/doc/buildfarmjob.txt'
106--- lib/lp/buildmaster/doc/buildfarmjob.txt 2010-05-04 13:42:25 +0000
107+++ lib/lp/buildmaster/doc/buildfarmjob.txt 2010-08-30 02:12:47 +0000
108@@ -2,7 +2,8 @@
109 ============
110
111 >>> from lp.buildmaster.interfaces.buildfarmjob import (
112- ... BuildFarmJobType, IBuildFarmJob)
113+ ... IBuildFarmJob)
114+ >>> from lp.buildmaster.enums import BuildFarmJobType
115 >>> from lp.buildmaster.model.buildfarmjob import (
116 ... BuildFarmJob, BuildFarmJobDerived)
117
118
119=== added file 'lib/lp/buildmaster/enums.py'
120--- lib/lp/buildmaster/enums.py 1970-01-01 00:00:00 +0000
121+++ lib/lp/buildmaster/enums.py 2010-08-30 02:12:47 +0000
122@@ -0,0 +1,133 @@
123+# Copyright 2009-2010 Canonical Ltd. This software is licensed under the
124+# GNU Affero General Public License version 3 (see the file LICENSE).
125+
126+# pylint: disable-msg=E0211,E0213
127+
128+"""Common build interfaces."""
129+
130+__metaclass__ = type
131+
132+__all__ = [
133+ 'BuildStatus',
134+ 'BuildFarmJobType',
135+ ]
136+
137+from lazr.enum import (
138+ DBEnumeratedType,
139+ DBItem,
140+ )
141+
142+
143+class BuildStatus(DBEnumeratedType):
144+ """Build status type
145+
146+ Builds exist in the database in a number of states such as 'complete',
147+ 'needs build' and 'dependency wait'. We need to track these states in
148+ order to correctly manage the autobuilder queues in the BuildQueue table.
149+ """
150+
151+ NEEDSBUILD = DBItem(0, """
152+ Needs building
153+
154+ Build record is fresh and needs building. Nothing is yet known to
155+ block this build and it is a candidate for building on any free
156+ builder of the relevant architecture
157+ """)
158+
159+ FULLYBUILT = DBItem(1, """
160+ Successfully built
161+
162+ Build record is an historic account of the build. The build is complete
163+ and needs no further work to complete it. The build log etc are all
164+ in place if available.
165+ """)
166+
167+ FAILEDTOBUILD = DBItem(2, """
168+ Failed to build
169+
170+ Build record is an historic account of the build. The build failed and
171+ cannot be automatically retried. Either a new upload will be needed
172+ or the build will have to be manually reset into 'NEEDSBUILD' when
173+ the issue is corrected
174+ """)
175+
176+ MANUALDEPWAIT = DBItem(3, """
177+ Dependency wait
178+
179+ Build record represents a package whose build dependencies cannot
180+ currently be satisfied within the relevant DistroArchSeries. This
181+ build will have to be manually given back (put into 'NEEDSBUILD') when
182+ the dependency issue is resolved.
183+ """)
184+
185+ CHROOTWAIT = DBItem(4, """
186+ Chroot problem
187+
188+ Build record represents a build which needs a chroot currently known
189+ to be damaged or bad in some way. The buildd maintainer will have to
190+ reset all relevant CHROOTWAIT builds to NEEDSBUILD after the chroot
191+ has been fixed.
192+ """)
193+
194+ SUPERSEDED = DBItem(5, """
195+ Build for superseded Source
196+
197+ Build record represents a build which never got to happen because the
198+ source package release for the build was superseded before the job
199+ was scheduled to be run on a builder. Builds which reach this state
200+ will rarely if ever be reset to any other state.
201+ """)
202+
203+ BUILDING = DBItem(6, """
204+ Currently building
205+
206+ Build record represents a build which is being build by one of the
207+ available builders.
208+ """)
209+
210+ FAILEDTOUPLOAD = DBItem(7, """
211+ Failed to upload
212+
213+ Build record is an historic account of a build that could not be
214+ uploaded correctly. It's mainly genereated by failures in
215+ process-upload which quietly rejects the binary upload resulted
216+ by the build procedure.
217+ In those cases all the build historic information will be stored (
218+ buildlog, datebuilt, duration, builder, etc) and the buildd admins
219+ will be notified via process-upload about the reason of the rejection.
220+ """)
221+
222+
223+class BuildFarmJobType(DBEnumeratedType):
224+ """Soyuz build farm job type.
225+
226+ An enumeration with the types of jobs that may be run on the Soyuz build
227+ farm.
228+ """
229+
230+ PACKAGEBUILD = DBItem(1, """
231+ Binary package build
232+
233+ Build a source package.
234+ """)
235+
236+ BRANCHBUILD = DBItem(2, """
237+ Branch build
238+
239+ Build a package from a bazaar branch.
240+ """)
241+
242+ RECIPEBRANCHBUILD = DBItem(3, """
243+ Recipe branch build
244+
245+ Build a package from a bazaar branch and a recipe.
246+ """)
247+
248+ TRANSLATIONTEMPLATESBUILD = DBItem(4, """
249+ Translation template build
250+
251+ Generate translation templates from a bazaar branch.
252+ """)
253+
254+
255+
256
257=== removed file 'lib/lp/buildmaster/interfaces/buildbase.py'
258--- lib/lp/buildmaster/interfaces/buildbase.py 2010-08-24 09:51:26 +0000
259+++ lib/lp/buildmaster/interfaces/buildbase.py 1970-01-01 00:00:00 +0000
260@@ -1,101 +0,0 @@
261-# Copyright 2009 Canonical Ltd. This software is licensed under the
262-# GNU Affero General Public License version 3 (see the file LICENSE).
263-
264-# pylint: disable-msg=E0211,E0213
265-
266-"""Common build interfaces."""
267-
268-__metaclass__ = type
269-
270-__all__ = [
271- 'BUILDD_MANAGER_LOG_NAME',
272- 'BuildStatus',
273- ]
274-
275-from lazr.enum import (
276- DBEnumeratedType,
277- DBItem,
278- )
279-
280-
281-BUILDD_MANAGER_LOG_NAME = "slave-scanner"
282-
283-
284-class BuildStatus(DBEnumeratedType):
285- """Build status type
286-
287- Builds exist in the database in a number of states such as 'complete',
288- 'needs build' and 'dependency wait'. We need to track these states in
289- order to correctly manage the autobuilder queues in the BuildQueue table.
290- """
291-
292- NEEDSBUILD = DBItem(0, """
293- Needs building
294-
295- Build record is fresh and needs building. Nothing is yet known to
296- block this build and it is a candidate for building on any free
297- builder of the relevant architecture
298- """)
299-
300- FULLYBUILT = DBItem(1, """
301- Successfully built
302-
303- Build record is an historic account of the build. The build is complete
304- and needs no further work to complete it. The build log etc are all
305- in place if available.
306- """)
307-
308- FAILEDTOBUILD = DBItem(2, """
309- Failed to build
310-
311- Build record is an historic account of the build. The build failed and
312- cannot be automatically retried. Either a new upload will be needed
313- or the build will have to be manually reset into 'NEEDSBUILD' when
314- the issue is corrected
315- """)
316-
317- MANUALDEPWAIT = DBItem(3, """
318- Dependency wait
319-
320- Build record represents a package whose build dependencies cannot
321- currently be satisfied within the relevant DistroArchSeries. This
322- build will have to be manually given back (put into 'NEEDSBUILD') when
323- the dependency issue is resolved.
324- """)
325-
326- CHROOTWAIT = DBItem(4, """
327- Chroot problem
328-
329- Build record represents a build which needs a chroot currently known
330- to be damaged or bad in some way. The buildd maintainer will have to
331- reset all relevant CHROOTWAIT builds to NEEDSBUILD after the chroot
332- has been fixed.
333- """)
334-
335- SUPERSEDED = DBItem(5, """
336- Build for superseded Source
337-
338- Build record represents a build which never got to happen because the
339- source package release for the build was superseded before the job
340- was scheduled to be run on a builder. Builds which reach this state
341- will rarely if ever be reset to any other state.
342- """)
343-
344- BUILDING = DBItem(6, """
345- Currently building
346-
347- Build record represents a build which is being build by one of the
348- available builders.
349- """)
350-
351- FAILEDTOUPLOAD = DBItem(7, """
352- Failed to upload
353-
354- Build record is an historic account of a build that could not be
355- uploaded correctly. It's mainly genereated by failures in
356- process-upload which quietly rejects the binary upload resulted
357- by the build procedure.
358- In those cases all the build historic information will be stored (
359- buildlog, datebuilt, duration, builder, etc) and the buildd admins
360- will be notified via process-upload about the reason of the rejection.
361- """)
362
363=== modified file 'lib/lp/buildmaster/interfaces/buildfarmjob.py'
364--- lib/lp/buildmaster/interfaces/buildfarmjob.py 2010-08-20 20:31:18 +0000
365+++ lib/lp/buildmaster/interfaces/buildfarmjob.py 2010-08-30 02:12:47 +0000
366@@ -14,12 +14,10 @@
367 'IBuildFarmJobSource',
368 'InconsistentBuildFarmJobError',
369 'ISpecificBuildFarmJob',
370- 'BuildFarmJobType',
371 ]
372
373 from lazr.enum import (
374 DBEnumeratedType,
375- DBItem,
376 )
377 from lazr.restful.declarations import exported
378 from lazr.restful.fields import Reference
379@@ -37,6 +35,7 @@
380
381 from canonical.launchpad import _
382 from canonical.launchpad.interfaces.librarian import ILibraryFileAlias
383+from lp.buildmaster.enums import BuildFarmJobType
384 from lp.buildmaster.interfaces.builder import IBuilder
385 from lp.soyuz.interfaces.processor import IProcessor
386
387@@ -50,38 +49,6 @@
388 """
389
390
391-class BuildFarmJobType(DBEnumeratedType):
392- """Soyuz build farm job type.
393-
394- An enumeration with the types of jobs that may be run on the Soyuz build
395- farm.
396- """
397-
398- PACKAGEBUILD = DBItem(1, """
399- Binary package build
400-
401- Build a source package.
402- """)
403-
404- BRANCHBUILD = DBItem(2, """
405- Branch build
406-
407- Build a package from a bazaar branch.
408- """)
409-
410- RECIPEBRANCHBUILD = DBItem(3, """
411- Recipe branch build
412-
413- Build a package from a bazaar branch and a recipe.
414- """)
415-
416- TRANSLATIONTEMPLATESBUILD = DBItem(4, """
417- Translation template build
418-
419- Generate translation templates from a bazaar branch.
420- """)
421-
422-
423 class IBuildFarmJobOld(Interface):
424 """Defines the previous non-database BuildFarmJob interface.
425
426
427=== modified file 'lib/lp/buildmaster/interfaces/buildqueue.py'
428--- lib/lp/buildmaster/interfaces/buildqueue.py 2010-08-20 20:31:18 +0000
429+++ lib/lp/buildmaster/interfaces/buildqueue.py 2010-08-30 02:12:47 +0000
430@@ -28,9 +28,9 @@
431 )
432
433 from canonical.launchpad import _
434+from lp.buildmaster.enums import BuildFarmJobType
435 from lp.buildmaster.interfaces.builder import IBuilder
436 from lp.buildmaster.interfaces.buildfarmjob import (
437- BuildFarmJobType,
438 IBuildFarmJob,
439 )
440 from lp.services.job.interfaces.job import IJob
441
442=== modified file 'lib/lp/buildmaster/interfaces/packagebuild.py'
443--- lib/lp/buildmaster/interfaces/packagebuild.py 2010-08-20 20:31:18 +0000
444+++ lib/lp/buildmaster/interfaces/packagebuild.py 2010-08-30 02:12:47 +0000
445@@ -24,7 +24,7 @@
446
447 from canonical.launchpad import _
448 from canonical.launchpad.interfaces.librarian import ILibraryFileAlias
449-from lp.buildmaster.interfaces.buildbase import BuildStatus
450+from lp.buildmaster.enums import BuildStatus
451 from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
452 from lp.registry.interfaces.distribution import IDistribution
453 from lp.registry.interfaces.distroseries import IDistroSeries
454
455=== modified file 'lib/lp/buildmaster/manager.py'
456--- lib/lp/buildmaster/manager.py 2010-08-20 20:31:18 +0000
457+++ lib/lp/buildmaster/manager.py 2010-08-30 02:12:47 +0000
458@@ -8,6 +8,7 @@
459 __all__ = [
460 'BaseDispatchResult',
461 'BuilddManager',
462+ 'BUILDD_MANAGER_LOG_NAME',
463 'FailDispatchResult',
464 'RecordingSlave',
465 'ResetDispatchResult',
466@@ -32,10 +33,12 @@
467 from canonical.config import config
468 from canonical.launchpad.webapp import urlappend
469 from canonical.librarian.db import write_transaction
470-from lp.buildmaster.interfaces.buildbase import BUILDD_MANAGER_LOG_NAME
471 from lp.services.twistedsupport.processmonitor import ProcessWithTimeout
472
473
474+BUILDD_MANAGER_LOG_NAME = "slave-scanner"
475+
476+
477 buildd_success_result_map = {
478 'ensurepresent': True,
479 'build': 'BuilderStatus.BUILDING',
480
481=== modified file 'lib/lp/buildmaster/model/buildfarmjob.py'
482--- lib/lp/buildmaster/model/buildfarmjob.py 2010-08-20 20:31:18 +0000
483+++ lib/lp/buildmaster/model/buildfarmjob.py 2010-08-30 02:12:47 +0000
484@@ -52,9 +52,9 @@
485 IStoreSelector,
486 MAIN_STORE,
487 )
488-from lp.buildmaster.interfaces.buildbase import BuildStatus
489+from lp.buildmaster.enums import BuildStatus
490+from lp.buildmaster.enums import BuildFarmJobType
491 from lp.buildmaster.interfaces.buildfarmjob import (
492- BuildFarmJobType,
493 IBuildFarmJob,
494 IBuildFarmJobOld,
495 IBuildFarmJobSet,
496
497=== modified file 'lib/lp/buildmaster/model/buildqueue.py'
498--- lib/lp/buildmaster/model/buildqueue.py 2010-08-20 20:31:18 +0000
499+++ lib/lp/buildmaster/model/buildqueue.py 2010-08-30 02:12:47 +0000
500@@ -45,8 +45,8 @@
501 MAIN_STORE,
502 )
503 from lp.app.errors import NotFoundError
504+from lp.buildmaster.enums import BuildFarmJobType
505 from lp.buildmaster.interfaces.buildfarmjob import (
506- BuildFarmJobType,
507 IBuildFarmJob,
508 )
509 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
510
511=== modified file 'lib/lp/buildmaster/model/packagebuild.py'
512--- lib/lp/buildmaster/model/packagebuild.py 2010-08-25 13:30:06 +0000
513+++ lib/lp/buildmaster/model/packagebuild.py 2010-08-30 02:12:47 +0000
514@@ -51,10 +51,7 @@
515 MAIN_STORE,
516 )
517 from canonical.librarian.utils import copy_and_close
518-from lp.buildmaster.interfaces.buildbase import (
519- BUILDD_MANAGER_LOG_NAME,
520- BuildStatus,
521- )
522+from lp.buildmaster.enums import BuildStatus
523 from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJobSource
524 from lp.buildmaster.interfaces.packagebuild import (
525 IPackageBuild,
526@@ -68,7 +65,6 @@
527 from lp.buildmaster.model.buildqueue import BuildQueue
528 from lp.registry.interfaces.pocket import (
529 PackagePublishingPocket,
530- pocketsuffix,
531 )
532 from lp.soyuz.adapters.archivedependencies import (
533 default_component_dependency_name,
534@@ -317,6 +313,7 @@
535
536 def handleStatus(self, status, librarian, slave_status):
537 """See `IPackageBuild`."""
538+ from lp.buildmaster.manager import BUILDD_MANAGER_LOG_NAME
539 logger = logging.getLogger(BUILDD_MANAGER_LOG_NAME)
540 method = getattr(self, '_handleStatus_' + status, None)
541 if method is None:
542
543=== modified file 'lib/lp/buildmaster/tests/test_builder.py'
544--- lib/lp/buildmaster/tests/test_builder.py 2010-08-25 11:01:59 +0000
545+++ lib/lp/buildmaster/tests/test_builder.py 2010-08-30 02:12:47 +0000
546@@ -15,7 +15,7 @@
547 MAIN_STORE,
548 )
549 from canonical.testing import LaunchpadZopelessLayer
550-from lp.buildmaster.interfaces.buildbase import BuildStatus
551+from lp.buildmaster.enums import BuildStatus
552 from lp.buildmaster.interfaces.builder import IBuilderSet
553 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
554 IBuildFarmJobBehavior,
555
556=== modified file 'lib/lp/buildmaster/tests/test_buildfarmjob.py'
557--- lib/lp/buildmaster/tests/test_buildfarmjob.py 2010-08-20 20:31:18 +0000
558+++ lib/lp/buildmaster/tests/test_buildfarmjob.py 2010-08-30 02:12:47 +0000
559@@ -22,9 +22,11 @@
560 DatabaseFunctionalLayer,
561 LaunchpadFunctionalLayer,
562 )
563-from lp.buildmaster.interfaces.buildbase import BuildStatus
564+from lp.buildmaster.enums import (
565+ BuildFarmJobType,
566+ BuildStatus,
567+ )
568 from lp.buildmaster.interfaces.buildfarmjob import (
569- BuildFarmJobType,
570 IBuildFarmJob,
571 IBuildFarmJobSet,
572 IBuildFarmJobSource,
573
574=== modified file 'lib/lp/buildmaster/tests/test_buildfarmjobbehavior.py'
575--- lib/lp/buildmaster/tests/test_buildfarmjobbehavior.py 2010-08-20 20:31:18 +0000
576+++ lib/lp/buildmaster/tests/test_buildfarmjobbehavior.py 2010-08-30 02:12:47 +0000
577@@ -7,7 +7,7 @@
578 from zope.security.proxy import removeSecurityProxy
579
580 from canonical.testing.layers import ZopelessDatabaseLayer
581-from lp.buildmaster.interfaces.buildbase import BuildStatus
582+from lp.buildmaster.enums import BuildStatus
583 from lp.buildmaster.interfaces.builder import CorruptBuildCookie
584 from lp.buildmaster.model.buildfarmjobbehavior import BuildFarmJobBehaviorBase
585 from lp.registry.interfaces.pocket import PackagePublishingPocket
586
587=== modified file 'lib/lp/buildmaster/tests/test_buildqueue.py'
588--- lib/lp/buildmaster/tests/test_buildqueue.py 2010-08-24 15:29:01 +0000
589+++ lib/lp/buildmaster/tests/test_buildqueue.py 2010-08-30 02:12:47 +0000
590@@ -27,12 +27,12 @@
591 LaunchpadZopelessLayer,
592 ZopelessDatabaseLayer,
593 )
594-from lp.buildmaster.interfaces.buildbase import BuildStatus
595+from lp.buildmaster.enums import (
596+ BuildFarmJobType,
597+ BuildStatus,
598+ )
599 from lp.buildmaster.interfaces.builder import IBuilderSet
600-from lp.buildmaster.interfaces.buildfarmjob import (
601- BuildFarmJobType,
602- IBuildFarmJob,
603- )
604+from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
605 from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
606 from lp.buildmaster.model.builder import specific_job_classes
607 from lp.buildmaster.model.buildfarmjob import BuildFarmJobDerived
608
609=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
610--- lib/lp/buildmaster/tests/test_manager.py 2010-08-20 20:31:18 +0000
611+++ lib/lp/buildmaster/tests/test_manager.py 2010-08-30 02:12:47 +0000
612@@ -36,7 +36,7 @@
613 LaunchpadZopelessLayer,
614 TwistedLayer,
615 )
616-from lp.buildmaster.interfaces.buildbase import BuildStatus
617+from lp.buildmaster.enums import BuildStatus
618 from lp.buildmaster.interfaces.builder import IBuilderSet
619 from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
620 from lp.buildmaster.manager import (
621
622=== modified file 'lib/lp/buildmaster/tests/test_packagebuild.py'
623--- lib/lp/buildmaster/tests/test_packagebuild.py 2010-08-24 12:16:10 +0000
624+++ lib/lp/buildmaster/tests/test_packagebuild.py 2010-08-30 02:12:47 +0000
625@@ -20,8 +20,10 @@
626 LaunchpadFunctionalLayer,
627 LaunchpadZopelessLayer,
628 )
629-from lp.buildmaster.interfaces.buildbase import BuildStatus
630-from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
631+from lp.buildmaster.enums import (
632+ BuildFarmJobType,
633+ BuildStatus,
634+ )
635 from lp.buildmaster.interfaces.packagebuild import (
636 IPackageBuild,
637 IPackageBuildSet,
638
639=== modified file 'lib/lp/code/browser/sourcepackagerecipebuild.py'
640--- lib/lp/code/browser/sourcepackagerecipebuild.py 2010-08-20 20:31:18 +0000
641+++ lib/lp/code/browser/sourcepackagerecipebuild.py 2010-08-30 02:12:47 +0000
642@@ -27,7 +27,7 @@
643 Link,
644 Navigation,
645 )
646-from lp.buildmaster.interfaces.buildbase import BuildStatus
647+from lp.buildmaster.enums import BuildStatus
648 from lp.code.interfaces.sourcepackagerecipebuild import (
649 ISourcePackageRecipeBuild,
650 )
651
652=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
653--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py 2010-08-20 20:31:18 +0000
654+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py 2010-08-30 02:12:47 +0000
655@@ -31,7 +31,7 @@
656 DatabaseFunctionalLayer,
657 LaunchpadFunctionalLayer,
658 )
659-from lp.buildmaster.interfaces.buildbase import BuildStatus
660+from lp.buildmaster.enums import BuildStatus
661 from lp.code.browser.sourcepackagerecipe import (
662 SourcePackageRecipeRequestBuildsView,
663 SourcePackageRecipeView,
664
665=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipebuild.py'
666--- lib/lp/code/browser/tests/test_sourcepackagerecipebuild.py 2010-08-20 20:31:18 +0000
667+++ lib/lp/code/browser/tests/test_sourcepackagerecipebuild.py 2010-08-30 02:12:47 +0000
668@@ -21,7 +21,7 @@
669 )
670 from canonical.launchpad.webapp import canonical_url
671 from canonical.testing import DatabaseFunctionalLayer
672-from lp.buildmaster.interfaces.buildbase import BuildStatus
673+from lp.buildmaster.enums import BuildStatus
674 from lp.soyuz.model.processor import ProcessorFamily
675 from lp.testing import (
676 ANONYMOUS,
677
678=== modified file 'lib/lp/code/mail/tests/test_sourcepackagerecipebuild.py'
679--- lib/lp/code/mail/tests/test_sourcepackagerecipebuild.py 2010-08-20 20:31:18 +0000
680+++ lib/lp/code/mail/tests/test_sourcepackagerecipebuild.py 2010-08-30 02:12:47 +0000
681@@ -13,7 +13,7 @@
682
683 from canonical.config import config
684 from canonical.testing import LaunchpadFunctionalLayer
685-from lp.buildmaster.interfaces.buildbase import BuildStatus
686+from lp.buildmaster.enums import BuildStatus
687 from lp.code.mail.sourcepackagerecipebuild import (
688 SourcePackageRecipeBuildMailer,
689 )
690
691=== modified file 'lib/lp/code/model/sourcepackagerecipe.py'
692--- lib/lp/code/model/sourcepackagerecipe.py 2010-08-23 16:51:11 +0000
693+++ lib/lp/code/model/sourcepackagerecipe.py 2010-08-30 02:12:47 +0000
694@@ -35,7 +35,7 @@
695 IMasterStore,
696 IStore,
697 )
698-from lp.buildmaster.interfaces.buildbase import BuildStatus
699+from lp.buildmaster.enums import BuildStatus
700 from lp.buildmaster.model.buildfarmjob import BuildFarmJob
701 from lp.buildmaster.model.packagebuild import PackageBuild
702 from lp.code.errors import (
703
704=== modified file 'lib/lp/code/model/sourcepackagerecipebuild.py'
705--- lib/lp/code/model/sourcepackagerecipebuild.py 2010-08-26 14:29:45 +0000
706+++ lib/lp/code/model/sourcepackagerecipebuild.py 2010-08-30 02:12:47 +0000
707@@ -45,8 +45,10 @@
708 IArchiveUploadPolicy,
709 SOURCE_PACKAGE_RECIPE_UPLOAD_POLICY_NAME,
710 )
711-from lp.buildmaster.interfaces.buildbase import BuildStatus
712-from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
713+from lp.buildmaster.enums import (
714+ BuildFarmJobType,
715+ BuildStatus,
716+ )
717 from lp.buildmaster.model.buildfarmjob import BuildFarmJobOldDerived
718 from lp.buildmaster.model.buildqueue import BuildQueue
719 from lp.buildmaster.model.packagebuild import (
720
721=== modified file 'lib/lp/code/model/tests/test_recipebuilder.py'
722--- lib/lp/code/model/tests/test_recipebuilder.py 2010-08-20 20:31:18 +0000
723+++ lib/lp/code/model/tests/test_recipebuilder.py 2010-08-30 02:12:47 +0000
724@@ -16,8 +16,8 @@
725
726 from canonical.launchpad.scripts.logger import BufferLogger
727 from canonical.testing import LaunchpadFunctionalLayer
728+from lp.buildmaster.enums import BuildFarmJobType
729 from lp.buildmaster.interfaces.builder import CannotBuild
730-from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
731 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
732 IBuildFarmJobBehavior,
733 )
734
735=== modified file 'lib/lp/code/model/tests/test_sourcepackagerecipe.py'
736--- lib/lp/code/model/tests/test_sourcepackagerecipe.py 2010-08-23 16:51:11 +0000
737+++ lib/lp/code/model/tests/test_sourcepackagerecipe.py 2010-08-30 02:12:47 +0000
738@@ -28,7 +28,7 @@
739 AppServerLayer,
740 DatabaseFunctionalLayer,
741 )
742-from lp.buildmaster.interfaces.buildbase import BuildStatus
743+from lp.buildmaster.enums import BuildStatus
744 from lp.buildmaster.interfaces.buildqueue import IBuildQueue
745 from lp.buildmaster.model.buildqueue import BuildQueue
746 from lp.code.errors import (
747
748=== modified file 'lib/lp/code/model/tests/test_sourcepackagerecipebuild.py'
749--- lib/lp/code/model/tests/test_sourcepackagerecipebuild.py 2010-08-24 09:51:26 +0000
750+++ lib/lp/code/model/tests/test_sourcepackagerecipebuild.py 2010-08-30 02:12:47 +0000
751@@ -24,7 +24,7 @@
752 LaunchpadZopelessLayer,
753 )
754 from lp.app.errors import NotFoundError
755-from lp.buildmaster.interfaces.buildbase import BuildStatus
756+from lp.buildmaster.enums import BuildStatus
757 from lp.buildmaster.interfaces.buildqueue import IBuildQueue
758 from lp.buildmaster.tests.test_packagebuild import (
759 TestGetUploadMethodsMixin,
760
761=== modified file 'lib/lp/registry/browser/person.py'
762--- lib/lp/registry/browser/person.py 2010-08-27 22:33:36 +0000
763+++ lib/lp/registry/browser/person.py 2010-08-30 02:12:47 +0000
764@@ -240,7 +240,7 @@
765 IBugTaskSet,
766 UNRESOLVED_BUGTASK_STATUSES,
767 )
768-from lp.buildmaster.interfaces.buildbase import BuildStatus
769+from lp.buildmaster.enums import BuildStatus
770 from lp.code.browser.sourcepackagerecipelisting import HasRecipesMenuMixin
771 from lp.code.errors import InvalidNamespace
772 from lp.code.interfaces.branchnamespace import IBranchNamespaceSet
773
774=== modified file 'lib/lp/registry/browser/tests/test_person_view.py'
775--- lib/lp/registry/browser/tests/test_person_view.py 2010-08-24 15:29:01 +0000
776+++ lib/lp/registry/browser/tests/test_person_view.py 2010-08-30 02:12:47 +0000
777@@ -20,7 +20,7 @@
778 LaunchpadZopelessLayer,
779 )
780 from lp.app.errors import NotFoundError
781-from lp.buildmaster.interfaces.buildbase import BuildStatus
782+from lp.buildmaster.enums import BuildStatus
783 from lp.registry.browser.person import (
784 PersonEditView,
785 PersonView,
786
787=== modified file 'lib/lp/registry/model/sourcepackage.py'
788--- lib/lp/registry/model/sourcepackage.py 2010-08-24 15:29:01 +0000
789+++ lib/lp/registry/model/sourcepackage.py 2010-08-30 02:12:47 +0000
790@@ -50,7 +50,7 @@
791 HasBugHeatMixin,
792 )
793 from lp.bugs.model.bugtask import BugTask
794-from lp.buildmaster.interfaces.buildbase import BuildStatus
795+from lp.buildmaster.enums import BuildStatus
796 from lp.code.interfaces.seriessourcepackagebranch import (
797 IMakeOfficialBranchLinks,
798 )
799
800=== modified file 'lib/lp/soyuz/browser/archive.py'
801--- lib/lp/soyuz/browser/archive.py 2010-08-24 15:29:01 +0000
802+++ lib/lp/soyuz/browser/archive.py 2010-08-30 02:12:47 +0000
803@@ -98,7 +98,7 @@
804 from canonical.widgets.textwidgets import StrippedTextWidget
805 from lp.app.browser.stringformatter import FormattersAPI
806 from lp.app.errors import NotFoundError
807-from lp.buildmaster.interfaces.buildbase import BuildStatus
808+from lp.buildmaster.enums import BuildStatus
809 from lp.registry.interfaces.person import (
810 IPersonSet,
811 PersonVisibility,
812
813=== modified file 'lib/lp/soyuz/browser/build.py'
814--- lib/lp/soyuz/browser/build.py 2010-08-24 12:25:48 +0000
815+++ lib/lp/soyuz/browser/build.py 2010-08-30 02:12:47 +0000
816@@ -42,7 +42,7 @@
817 from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
818 from canonical.lazr.utils import safe_hasattr
819 from lp.app.errors import UnexpectedFormData
820-from lp.buildmaster.interfaces.buildbase import BuildStatus
821+from lp.buildmaster.enums import BuildStatus
822 from lp.services.job.interfaces.job import JobStatus
823 from lp.soyuz.interfaces.binarypackagebuild import (
824 IBinaryPackageBuild,
825
826=== modified file 'lib/lp/soyuz/browser/tests/archive-views.txt'
827--- lib/lp/soyuz/browser/tests/archive-views.txt 2010-08-23 16:51:11 +0000
828+++ lib/lp/soyuz/browser/tests/archive-views.txt 2010-08-30 02:12:47 +0000
829@@ -360,7 +360,7 @@
830
831 Let's set some builds appropriately to see the results.
832
833- >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
834+ >>> from lp.buildmaster.enums import BuildStatus
835 >>> from lp.soyuz.interfaces.binarypackagebuild import (
836 ... IBinaryPackageBuildSet)
837 >>> warty_hppa = getUtility(IDistributionSet)['ubuntu']['warty']['hppa']
838
839=== modified file 'lib/lp/soyuz/browser/tests/build-views.txt'
840--- lib/lp/soyuz/browser/tests/build-views.txt 2010-08-24 15:29:01 +0000
841+++ lib/lp/soyuz/browser/tests/build-views.txt 2010-08-30 02:12:47 +0000
842@@ -4,7 +4,7 @@
843 from the sampledata which happens to be in FAILEDTOBUILD status.
844
845 >>> from zope.component import getUtility
846- >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
847+ >>> from lp.buildmaster.enums import BuildStatus
848 >>> from lp.registry.interfaces.distribution import IDistributionSet
849
850 >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
851
852=== modified file 'lib/lp/soyuz/browser/tests/builder-views.txt'
853--- lib/lp/soyuz/browser/tests/builder-views.txt 2010-08-24 15:29:01 +0000
854+++ lib/lp/soyuz/browser/tests/builder-views.txt 2010-08-30 02:12:47 +0000
855@@ -141,7 +141,7 @@
856 SoyuzTestPublisher is used to make a new publication only in Celso's
857 private PPA.
858
859- >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
860+ >>> from lp.buildmaster.enums import BuildStatus
861 >>> from lp.soyuz.tests.test_publishing import (
862 ... SoyuzTestPublisher)
863 >>> from lp.soyuz.enums import (
864
865=== modified file 'lib/lp/soyuz/doc/archive.txt'
866--- lib/lp/soyuz/doc/archive.txt 2010-08-24 15:29:01 +0000
867+++ lib/lp/soyuz/doc/archive.txt 2010-08-30 02:12:47 +0000
868@@ -938,7 +938,7 @@
869 be returned, but you can also ask for releases with builds in a certain
870 state.
871
872- >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
873+ >>> from lp.buildmaster.enums import BuildStatus
874 >>> releases = cprov_archive.getSourcePackageReleases(
875 ... build_status=BuildStatus.FULLYBUILT)
876 >>> for release in releases:
877
878=== modified file 'lib/lp/soyuz/doc/binarypackagebuild.txt'
879--- lib/lp/soyuz/doc/binarypackagebuild.txt 2010-08-25 12:57:29 +0000
880+++ lib/lp/soyuz/doc/binarypackagebuild.txt 2010-08-30 02:12:47 +0000
881@@ -136,7 +136,7 @@
882
883 If the build does not have any uploads, None is returned:
884
885- >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
886+ >>> from lp.buildmaster.enums import BuildStatus
887 >>> from lp.soyuz.interfaces.binarypackagebuild import (
888 ... IBinaryPackageBuildSet)
889 >>> at_build = getUtility(IBinaryPackageBuildSet).getByBuildID(15)
890
891=== modified file 'lib/lp/soyuz/doc/build-estimated-dispatch-time.txt'
892--- lib/lp/soyuz/doc/build-estimated-dispatch-time.txt 2010-05-20 15:30:16 +0000
893+++ lib/lp/soyuz/doc/build-estimated-dispatch-time.txt 2010-08-30 02:12:47 +0000
894@@ -44,7 +44,7 @@
895 the pending job.
896
897 >>> from datetime import timedelta
898- >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
899+ >>> from lp.buildmaster.enums import BuildStatus
900 >>> alsa_build = alsa_spr.createBuild(
901 ... hoary['i386'], PackagePublishingPocket.RELEASE,
902 ... hoary.main_archive)
903
904=== modified file 'lib/lp/soyuz/doc/build-notification.txt'
905--- lib/lp/soyuz/doc/build-notification.txt 2010-08-23 16:51:11 +0000
906+++ lib/lp/soyuz/doc/build-notification.txt 2010-08-30 02:12:47 +0000
907@@ -419,7 +419,7 @@
908 >>> from lp.registry.interfaces.person import IPersonSet
909 >>> cprov = getUtility(IPersonSet).getByName('cprov')
910
911- >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
912+ >>> from lp.buildmaster.enums import BuildStatus
913 >>> failed_candidate = cprov.archive.getBuildRecords(
914 ... build_state=BuildStatus.FAILEDTOBUILD, name='cdrkit')[0]
915
916
917=== modified file 'lib/lp/soyuz/doc/buildd-dispatching.txt'
918--- lib/lp/soyuz/doc/buildd-dispatching.txt 2010-06-02 16:32:10 +0000
919+++ lib/lp/soyuz/doc/buildd-dispatching.txt 2010-08-30 02:12:47 +0000
920@@ -186,7 +186,7 @@
921
922 >>> BuilddSlaveTestSetup().tearDown()
923
924- >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
925+ >>> from lp.buildmaster.enums import BuildStatus
926 >>> build.status = BuildStatus.FAILEDTOBUILD
927 >>> job.destroySelf()
928 >>> flush_database_updates()
929
930=== modified file 'lib/lp/soyuz/doc/buildd-slavescanner.txt'
931--- lib/lp/soyuz/doc/buildd-slavescanner.txt 2010-08-24 15:29:01 +0000
932+++ lib/lp/soyuz/doc/buildd-slavescanner.txt 2010-08-30 02:12:47 +0000
933@@ -429,7 +429,7 @@
934 Now in order to emulate a successfully binary upload we will update
935 the build record to FULLYBUILT, as the process-upload would do:
936
937- >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
938+ >>> from lp.buildmaster.enums import BuildStatus
939 >>> build.status = BuildStatus.FULLYBUILT
940
941 Now the updateBuild should recognize this build record as a
942
943=== modified file 'lib/lp/soyuz/doc/hasbuildrecords.txt'
944--- lib/lp/soyuz/doc/hasbuildrecords.txt 2010-03-06 04:57:40 +0000
945+++ lib/lp/soyuz/doc/hasbuildrecords.txt 2010-08-30 02:12:47 +0000
946@@ -22,7 +22,7 @@
947 The method has a number of filtering options, such as filtering by build
948 status,
949
950- >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
951+ >>> from lp.buildmaster.enums import BuildStatus
952 >>> hoary.getBuildRecords(build_state=BuildStatus.FULLYBUILT).count()
953 2
954
955
956=== modified file 'lib/lp/soyuz/doc/packageupload-lookups.txt'
957--- lib/lp/soyuz/doc/packageupload-lookups.txt 2010-03-06 04:57:40 +0000
958+++ lib/lp/soyuz/doc/packageupload-lookups.txt 2010-08-30 02:12:47 +0000
959@@ -29,7 +29,7 @@
960
961 # Audit the source publication and builds of a given archive
962 # and report missing uploads.
963- >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
964+ >>> from lp.buildmaster.enums import BuildStatus
965 >>> def check_upload_lookups(archive):
966 ... sources_missing_upload = []
967 ... sources = list(archive.getPublishedSources())
968
969=== modified file 'lib/lp/soyuz/doc/publishing.txt'
970--- lib/lp/soyuz/doc/publishing.txt 2010-08-24 15:29:01 +0000
971+++ lib/lp/soyuz/doc/publishing.txt 2010-08-30 02:12:47 +0000
972@@ -139,7 +139,7 @@
973 augments the IBuildSet.getStatusSummaryForBuilds() method to include the
974 'pending' state when builds are fully built but not yet published.
975
976- >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
977+ >>> from lp.buildmaster.enums import BuildStatus
978 >>> spph = test_publisher.getPubSource(
979 ... sourcename='abc', architecturehintlist='any')
980 >>> builds = spph.createMissingBuilds()
981
982=== modified file 'lib/lp/soyuz/doc/queuebuilder.txt'
983--- lib/lp/soyuz/doc/queuebuilder.txt 2010-08-24 15:29:01 +0000
984+++ lib/lp/soyuz/doc/queuebuilder.txt 2010-08-30 02:12:47 +0000
985@@ -232,7 +232,7 @@
986 >>> copied_pub = pub_failed.copyTo(
987 ... hoary, PackagePublishingPocket.RELEASE, warty.main_archive)
988
989- >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
990+ >>> from lp.buildmaster.enums import BuildStatus
991 >>> from lp.soyuz.interfaces.binarypackagebuild import (
992 ... IBinaryPackageBuildSet)
993 >>> failed_build = pub_failed.sourcepackagerelease.createBuild(
994
995=== modified file 'lib/lp/soyuz/doc/sourcepackagerelease-build-lookup.txt'
996--- lib/lp/soyuz/doc/sourcepackagerelease-build-lookup.txt 2010-08-24 15:29:01 +0000
997+++ lib/lp/soyuz/doc/sourcepackagerelease-build-lookup.txt 2010-08-30 02:12:47 +0000
998@@ -43,7 +43,7 @@
999 >>> hoary_evo_source = hoary.getSourcePackage('evolution')
1000 >>> evo_release = hoary_evo_source['1.0'].sourcepackagerelease
1001
1002- >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
1003+ >>> from lp.buildmaster.enums import BuildStatus
1004 >>> evo_build_i386 = evo_release.createBuild(
1005 ... hoary_i386, pocket_release, ubuntu.main_archive,
1006 ... status=BuildStatus.FULLYBUILT)
1007
1008=== modified file 'lib/lp/soyuz/doc/soyuz-set-of-uploads.txt'
1009--- lib/lp/soyuz/doc/soyuz-set-of-uploads.txt 2010-08-26 15:28:34 +0000
1010+++ lib/lp/soyuz/doc/soyuz-set-of-uploads.txt 2010-08-30 02:12:47 +0000
1011@@ -608,7 +608,7 @@
1012
1013 Check there's a SourcePackageRelease with no build.
1014
1015- >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
1016+ >>> from lp.buildmaster.enums import BuildStatus
1017 >>> from lp.registry.model.sourcepackagename import SourcePackageName
1018 >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
1019 >>> from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
1020
1021=== modified file 'lib/lp/soyuz/interfaces/binarypackagebuild.py'
1022--- lib/lp/soyuz/interfaces/binarypackagebuild.py 2010-08-20 20:31:18 +0000
1023+++ lib/lp/soyuz/interfaces/binarypackagebuild.py 2010-08-30 02:12:47 +0000
1024@@ -38,7 +38,7 @@
1025 )
1026
1027 from canonical.launchpad import _
1028-from lp.buildmaster.interfaces.buildbase import BuildStatus
1029+from lp.buildmaster.enums import BuildStatus
1030 from lp.buildmaster.interfaces.packagebuild import IPackageBuild
1031 from lp.soyuz.interfaces.processor import IProcessor
1032 from lp.soyuz.interfaces.publishing import ISourcePackagePublishingHistory
1033
1034=== modified file 'lib/lp/soyuz/model/archive.py'
1035--- lib/lp/soyuz/model/archive.py 2010-08-24 15:29:01 +0000
1036+++ lib/lp/soyuz/model/archive.py 2010-08-30 02:12:47 +0000
1037@@ -75,7 +75,7 @@
1038 re_isadeb,
1039 re_issource,
1040 )
1041-from lp.buildmaster.interfaces.buildbase import BuildStatus
1042+from lp.buildmaster.enums import BuildStatus
1043 from lp.buildmaster.interfaces.packagebuild import IPackageBuildSet
1044 from lp.buildmaster.model.buildfarmjob import BuildFarmJob
1045 from lp.buildmaster.model.packagebuild import PackageBuild
1046
1047=== modified file 'lib/lp/soyuz/model/binarypackagebuild.py'
1048--- lib/lp/soyuz/model/binarypackagebuild.py 2010-08-25 11:01:59 +0000
1049+++ lib/lp/soyuz/model/binarypackagebuild.py 2010-08-30 02:12:47 +0000
1050@@ -69,8 +69,10 @@
1051 from canonical.launchpad.webapp.tales import DurationFormatterAPI
1052 from lp.app.errors import NotFoundError
1053 from lp.archivepublisher.utils import get_ppa_reference
1054-from lp.buildmaster.interfaces.buildbase import BuildStatus
1055-from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
1056+from lp.buildmaster.enums import (
1057+ BuildFarmJobType,
1058+ BuildStatus,
1059+ )
1060 from lp.buildmaster.interfaces.packagebuild import IPackageBuildSource
1061 from lp.buildmaster.model.builder import Builder
1062 from lp.buildmaster.model.buildfarmjob import BuildFarmJob
1063
1064=== modified file 'lib/lp/soyuz/model/buildfarmbuildjob.py'
1065--- lib/lp/soyuz/model/buildfarmbuildjob.py 2010-08-20 20:31:18 +0000
1066+++ lib/lp/soyuz/model/buildfarmbuildjob.py 2010-08-30 02:12:47 +0000
1067@@ -10,7 +10,7 @@
1068 from zope.interface import implements
1069
1070 from canonical.database.constants import UTC_NOW
1071-from lp.buildmaster.interfaces.buildbase import BuildStatus
1072+from lp.buildmaster.enums import BuildStatus
1073 from lp.buildmaster.model.buildfarmjob import BuildFarmJobOld
1074 from lp.soyuz.interfaces.buildfarmbuildjob import IBuildFarmBuildJob
1075
1076
1077=== modified file 'lib/lp/soyuz/model/buildpackagejob.py'
1078--- lib/lp/soyuz/model/buildpackagejob.py 2010-08-24 15:29:01 +0000
1079+++ lib/lp/soyuz/model/buildpackagejob.py 2010-08-30 02:12:47 +0000
1080@@ -19,7 +19,7 @@
1081 from zope.interface import implements
1082
1083 from canonical.database.sqlbase import sqlvalues
1084-from lp.buildmaster.interfaces.buildbase import BuildStatus
1085+from lp.buildmaster.enums import BuildStatus
1086 from lp.buildmaster.model.buildfarmjob import BuildFarmJobOldDerived
1087 from lp.registry.interfaces.pocket import PackagePublishingPocket
1088 from lp.registry.interfaces.sourcepackage import SourcePackageUrgency
1089
1090=== modified file 'lib/lp/soyuz/model/publishing.py'
1091--- lib/lp/soyuz/model/publishing.py 2010-08-24 15:29:01 +0000
1092+++ lib/lp/soyuz/model/publishing.py 2010-08-30 02:12:47 +0000
1093@@ -63,7 +63,7 @@
1094 MAIN_STORE,
1095 )
1096 from lp.app.errors import NotFoundError
1097-from lp.buildmaster.interfaces.buildbase import BuildStatus
1098+from lp.buildmaster.enums import BuildStatus
1099 from lp.buildmaster.model.buildfarmjob import BuildFarmJob
1100 from lp.buildmaster.model.packagebuild import PackageBuild
1101 from lp.registry.interfaces.person import validate_public_person
1102
1103=== modified file 'lib/lp/soyuz/model/sourcepackagerelease.py'
1104--- lib/lp/soyuz/model/sourcepackagerelease.py 2010-08-24 15:29:01 +0000
1105+++ lib/lp/soyuz/model/sourcepackagerelease.py 2010-08-30 02:12:47 +0000
1106@@ -53,7 +53,7 @@
1107 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
1108 from lp.app.errors import NotFoundError
1109 from lp.archiveuploader.utils import determine_source_file_type
1110-from lp.buildmaster.interfaces.buildbase import BuildStatus
1111+from lp.buildmaster.enums import BuildStatus
1112 from lp.registry.interfaces.person import validate_public_person
1113 from lp.registry.interfaces.sourcepackage import (
1114 SourcePackageType,
1115
1116=== modified file 'lib/lp/soyuz/scripts/buildd.py'
1117--- lib/lp/soyuz/scripts/buildd.py 2010-08-20 20:31:18 +0000
1118+++ lib/lp/soyuz/scripts/buildd.py 2010-08-30 02:12:47 +0000
1119@@ -17,7 +17,7 @@
1120 from lp.app.errors import NotFoundError
1121 from lp.archivepublisher.debversion import Version
1122 from lp.archivepublisher.utils import process_in_batches
1123-from lp.buildmaster.interfaces.buildbase import BuildStatus
1124+from lp.buildmaster.enums import BuildStatus
1125 from lp.buildmaster.interfaces.builder import IBuilderSet
1126 from lp.registry.interfaces.distribution import IDistributionSet
1127 from lp.registry.interfaces.series import SeriesStatus
1128
1129=== modified file 'lib/lp/soyuz/scripts/gina/handlers.py'
1130--- lib/lp/soyuz/scripts/gina/handlers.py 2010-08-24 15:29:01 +0000
1131+++ lib/lp/soyuz/scripts/gina/handlers.py 2010-08-30 02:12:47 +0000
1132@@ -38,7 +38,7 @@
1133 determine_binary_file_type,
1134 determine_source_file_type,
1135 )
1136-from lp.buildmaster.interfaces.buildbase import BuildStatus
1137+from lp.buildmaster.enums import BuildStatus
1138 from lp.registry.interfaces.person import (
1139 IPersonSet,
1140 PersonCreationRationale,
1141
1142=== modified file 'lib/lp/soyuz/scripts/initialise_distroseries.py'
1143--- lib/lp/soyuz/scripts/initialise_distroseries.py 2010-08-25 11:01:59 +0000
1144+++ lib/lp/soyuz/scripts/initialise_distroseries.py 2010-08-30 02:12:47 +0000
1145@@ -18,7 +18,7 @@
1146 MAIN_STORE,
1147 MASTER_FLAVOR,
1148 )
1149-from lp.buildmaster.interfaces.buildbase import BuildStatus
1150+from lp.buildmaster.enums import BuildStatus
1151 from lp.registry.interfaces.pocket import PackagePublishingPocket
1152 from lp.soyuz.adapters.packagelocation import PackageLocation
1153 from lp.soyuz.enums import (
1154
1155=== modified file 'lib/lp/soyuz/scripts/packagecopier.py'
1156--- lib/lp/soyuz/scripts/packagecopier.py 2010-08-24 13:56:22 +0000
1157+++ lib/lp/soyuz/scripts/packagecopier.py 2010-08-30 02:12:47 +0000
1158@@ -25,7 +25,7 @@
1159
1160 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
1161 from canonical.librarian.utils import copy_and_close
1162-from lp.buildmaster.interfaces.buildbase import BuildStatus
1163+from lp.buildmaster.enums import BuildStatus
1164 from lp.soyuz.adapters.packagelocation import build_package_location
1165 from lp.soyuz.enums import ArchivePurpose
1166 from lp.soyuz.interfaces.archive import (
1167
1168=== modified file 'lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py'
1169--- lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py 2010-08-20 20:31:18 +0000
1170+++ lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py 2010-08-30 02:12:47 +0000
1171@@ -25,7 +25,7 @@
1172 LaunchpadLayer,
1173 LaunchpadZopelessLayer,
1174 )
1175-from lp.buildmaster.interfaces.buildbase import BuildStatus
1176+from lp.buildmaster.enums import BuildStatus
1177 from lp.buildmaster.model.buildfarmjob import BuildFarmJob
1178 from lp.buildmaster.model.packagebuild import PackageBuild
1179 from lp.registry.interfaces.distribution import IDistributionSet
1180
1181=== modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
1182--- lib/lp/soyuz/scripts/tests/test_copypackage.py 2010-08-24 15:29:01 +0000
1183+++ lib/lp/soyuz/scripts/tests/test_copypackage.py 2010-08-30 02:12:47 +0000
1184@@ -28,7 +28,7 @@
1185 IBugSet,
1186 )
1187 from lp.bugs.interfaces.bugtask import BugTaskStatus
1188-from lp.buildmaster.interfaces.buildbase import BuildStatus
1189+from lp.buildmaster.enums import BuildStatus
1190 from lp.registry.interfaces.distribution import IDistributionSet
1191 from lp.registry.interfaces.person import IPersonSet
1192 from lp.registry.interfaces.pocket import PackagePublishingPocket
1193
1194=== modified file 'lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py'
1195--- lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py 2010-08-27 06:52:42 +0000
1196+++ lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py 2010-08-30 02:12:47 +0000
1197@@ -21,7 +21,7 @@
1198 MASTER_FLAVOR,
1199 )
1200 from canonical.testing.layers import LaunchpadZopelessLayer
1201-from lp.buildmaster.interfaces.buildbase import BuildStatus
1202+from lp.buildmaster.enums import BuildStatus
1203 from lp.registry.interfaces.pocket import PackagePublishingPocket
1204 from lp.soyuz.interfaces.archivepermission import IArchivePermissionSet
1205 from lp.soyuz.interfaces.packageset import IPackagesetSet
1206
1207=== modified file 'lib/lp/soyuz/scripts/tests/test_populatearchive.py'
1208--- lib/lp/soyuz/scripts/tests/test_populatearchive.py 2010-08-24 15:29:01 +0000
1209+++ lib/lp/soyuz/scripts/tests/test_populatearchive.py 2010-08-30 02:12:47 +0000
1210@@ -19,7 +19,7 @@
1211 )
1212 from canonical.testing import LaunchpadZopelessLayer
1213 from canonical.testing.layers import DatabaseLayer
1214-from lp.buildmaster.interfaces.buildbase import BuildStatus
1215+from lp.buildmaster.enums import BuildStatus
1216 from lp.registry.interfaces.distribution import IDistributionSet
1217 from lp.registry.interfaces.person import IPersonSet
1218 from lp.services.job.interfaces.job import JobStatus
1219
1220=== modified file 'lib/lp/soyuz/stories/ppa/xx-copy-packages.txt'
1221--- lib/lp/soyuz/stories/ppa/xx-copy-packages.txt 2010-08-24 15:29:01 +0000
1222+++ lib/lp/soyuz/stories/ppa/xx-copy-packages.txt 2010-08-30 02:12:47 +0000
1223@@ -972,7 +972,7 @@
1224 ... archive=jblack_friends.archive,
1225 ... status=PackagePublishingStatus.PUBLISHED)
1226 >>> [build] = jblack_friends_foo_src.createMissingBuilds()
1227- >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
1228+ >>> from lp.buildmaster.enums import BuildStatus
1229 >>> build.status = BuildStatus.FAILEDTOBUILD
1230
1231 >>> flush_database_updates()
1232
1233=== modified file 'lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt'
1234--- lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt 2010-05-26 08:53:13 +0000
1235+++ lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt 2010-08-30 02:12:47 +0000
1236@@ -410,7 +410,7 @@
1237 If the ppa has some current activity (building or waiting builds) then this
1238 is also included in the statistics portlet.
1239
1240- >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
1241+ >>> from lp.buildmaster.enums import BuildStatus
1242 >>> from lp.registry.interfaces.person import IPersonSet
1243 >>> from lp.soyuz.interfaces.binarypackagebuild import (
1244 ... IBinaryPackageBuildSet)
1245
1246=== modified file 'lib/lp/soyuz/stories/soyuz/xx-build-record.txt'
1247--- lib/lp/soyuz/stories/soyuz/xx-build-record.txt 2010-06-08 15:13:29 +0000
1248+++ lib/lp/soyuz/stories/soyuz/xx-build-record.txt 2010-08-30 02:12:47 +0000
1249@@ -153,7 +153,7 @@
1250 # build with an known buildlog 'tail'.
1251 >>> login('foo.bar@canonical.com')
1252 >>> from canonical.database.constants import UTC_NOW
1253- >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
1254+ >>> from lp.buildmaster.enums import BuildStatus
1255 >>> in_progress_build.buildqueue_record.reset()
1256 >>> build.buildqueue_record.markAsBuilding(bob_builder)
1257 >>> build.buildqueue_record.logtail = 'one line\nanother line'
1258
1259=== modified file 'lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt'
1260--- lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt 2010-06-25 23:12:45 +0000
1261+++ lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt 2010-08-30 02:12:47 +0000
1262@@ -60,7 +60,7 @@
1263 >>> import datetime
1264 >>> from zope.component import getUtility
1265 >>> from zope.security.proxy import removeSecurityProxy
1266- >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
1267+ >>> from lp.buildmaster.enums import BuildStatus
1268 >>> from lp.registry.interfaces.person import IPersonSet
1269 >>> login('foo.bar@canonical.com')
1270 >>> cprov = getUtility(IPersonSet).getByName('cprov')
1271
1272=== modified file 'lib/lp/soyuz/stories/webservice/xx-builds.txt'
1273--- lib/lp/soyuz/stories/webservice/xx-builds.txt 2010-06-14 18:14:28 +0000
1274+++ lib/lp/soyuz/stories/webservice/xx-builds.txt 2010-08-30 02:12:47 +0000
1275@@ -200,7 +200,7 @@
1276 alter the buildstate to one that cannot be retried:
1277
1278 >>> login('foo.bar@canonical.com')
1279- >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
1280+ >>> from lp.buildmaster.enums import BuildStatus
1281 >>> build.status = BuildStatus.FAILEDTOUPLOAD
1282 >>> logout()
1283
1284
1285=== modified file 'lib/lp/soyuz/tests/test_archive.py'
1286--- lib/lp/soyuz/tests/test_archive.py 2010-08-24 15:29:01 +0000
1287+++ lib/lp/soyuz/tests/test_archive.py 2010-08-30 02:12:47 +0000
1288@@ -23,7 +23,7 @@
1289 DatabaseFunctionalLayer,
1290 LaunchpadZopelessLayer,
1291 )
1292-from lp.buildmaster.interfaces.buildbase import BuildStatus
1293+from lp.buildmaster.enums import BuildStatus
1294 from lp.registry.interfaces.pocket import PackagePublishingPocket
1295 from lp.registry.interfaces.series import SeriesStatus
1296 from lp.services.job.interfaces.job import JobStatus
1297
1298=== modified file 'lib/lp/soyuz/tests/test_binarypackagebuild.py'
1299--- lib/lp/soyuz/tests/test_binarypackagebuild.py 2010-08-25 11:01:59 +0000
1300+++ lib/lp/soyuz/tests/test_binarypackagebuild.py 2010-08-30 02:12:47 +0000
1301@@ -14,7 +14,7 @@
1302 from zope.security.proxy import removeSecurityProxy
1303
1304 from canonical.testing import LaunchpadZopelessLayer
1305-from lp.buildmaster.interfaces.buildbase import BuildStatus
1306+from lp.buildmaster.enums import BuildStatus
1307 from lp.buildmaster.interfaces.builder import IBuilderSet
1308 from lp.buildmaster.interfaces.buildqueue import IBuildQueue
1309 from lp.buildmaster.interfaces.packagebuild import IPackageBuild
1310
1311=== modified file 'lib/lp/soyuz/tests/test_buildpackagejob.py'
1312--- lib/lp/soyuz/tests/test_buildpackagejob.py 2010-08-24 15:29:01 +0000
1313+++ lib/lp/soyuz/tests/test_buildpackagejob.py 2010-08-30 02:12:47 +0000
1314@@ -17,7 +17,7 @@
1315 DatabaseFunctionalLayer,
1316 LaunchpadZopelessLayer,
1317 )
1318-from lp.buildmaster.interfaces.buildbase import BuildStatus
1319+from lp.buildmaster.enums import BuildStatus
1320 from lp.buildmaster.interfaces.builder import IBuilderSet
1321 from lp.soyuz.enums import ArchivePurpose
1322 from lp.soyuz.interfaces.buildfarmbuildjob import IBuildFarmBuildJob
1323
1324=== modified file 'lib/lp/soyuz/tests/test_copyarchivejob.py'
1325--- lib/lp/soyuz/tests/test_copyarchivejob.py 2010-08-24 15:29:01 +0000
1326+++ lib/lp/soyuz/tests/test_copyarchivejob.py 2010-08-30 02:12:47 +0000
1327@@ -9,7 +9,7 @@
1328 from zope.security.proxy import removeSecurityProxy
1329
1330 from canonical.testing import DatabaseFunctionalLayer
1331-from lp.buildmaster.interfaces.buildbase import BuildStatus
1332+from lp.buildmaster.enums import BuildStatus
1333 from lp.registry.interfaces.pocket import PackagePublishingPocket
1334 from lp.soyuz.adapters.packagelocation import PackageLocation
1335 from lp.soyuz.enums import ArchivePurpose
1336
1337=== modified file 'lib/lp/soyuz/tests/test_hasbuildrecords.py'
1338--- lib/lp/soyuz/tests/test_hasbuildrecords.py 2010-08-20 20:31:18 +0000
1339+++ lib/lp/soyuz/tests/test_hasbuildrecords.py 2010-08-30 02:12:47 +0000
1340@@ -7,9 +7,9 @@
1341 from zope.security.proxy import removeSecurityProxy
1342
1343 from canonical.testing import LaunchpadZopelessLayer
1344+from lp.buildmaster.enums import BuildFarmJobType
1345 from lp.buildmaster.interfaces.builder import IBuilderSet
1346 from lp.buildmaster.interfaces.buildfarmjob import (
1347- BuildFarmJobType,
1348 IBuildFarmJob,
1349 )
1350 from lp.buildmaster.interfaces.packagebuild import IPackageBuildSource
1351@@ -144,7 +144,7 @@
1352 # can only test this by creating a lone IBuildFarmJob of a
1353 # different type.
1354 from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJobSource
1355- from lp.buildmaster.interfaces.buildbase import BuildStatus
1356+ from lp.buildmaster.enums import BuildStatus
1357 build_farm_job = getUtility(IBuildFarmJobSource).new(
1358 job_type=BuildFarmJobType.RECIPEBRANCHBUILD, virtualized=True,
1359 status=BuildStatus.BUILDING)
1360
1361=== modified file 'lib/lp/soyuz/tests/test_packagecloner.py'
1362--- lib/lp/soyuz/tests/test_packagecloner.py 2010-08-24 15:29:01 +0000
1363+++ lib/lp/soyuz/tests/test_packagecloner.py 2010-08-30 02:12:47 +0000
1364@@ -7,7 +7,7 @@
1365 from zope.security.proxy import removeSecurityProxy
1366
1367 from canonical.testing import LaunchpadZopelessLayer
1368-from lp.buildmaster.interfaces.buildbase import BuildStatus
1369+from lp.buildmaster.enums import BuildStatus
1370 from lp.registry.interfaces.pocket import PackagePublishingPocket
1371 from lp.soyuz.adapters.packagelocation import PackageLocation
1372 from lp.soyuz.enums import (
1373
1374=== modified file 'lib/lp/soyuz/tests/test_packageupload.py'
1375--- lib/lp/soyuz/tests/test_packageupload.py 2010-08-24 15:29:01 +0000
1376+++ lib/lp/soyuz/tests/test_packageupload.py 2010-08-30 02:12:47 +0000
1377@@ -13,7 +13,7 @@
1378 from canonical.launchpad.scripts import BufferLogger
1379 from canonical.testing import LaunchpadZopelessLayer
1380 from lp.archiveuploader.tests import datadir
1381-from lp.buildmaster.interfaces.buildbase import BuildStatus
1382+from lp.buildmaster.enums import BuildStatus
1383 from lp.registry.interfaces.distribution import IDistributionSet
1384 from lp.registry.interfaces.pocket import PackagePublishingPocket
1385 from lp.registry.interfaces.series import SeriesStatus
1386
1387=== modified file 'lib/lp/soyuz/tests/test_publishing.py'
1388--- lib/lp/soyuz/tests/test_publishing.py 2010-08-24 12:25:48 +0000
1389+++ lib/lp/soyuz/tests/test_publishing.py 2010-08-30 02:12:47 +0000
1390@@ -28,7 +28,7 @@
1391 from lp.app.errors import NotFoundError
1392 from lp.archivepublisher.config import Config
1393 from lp.archivepublisher.diskpool import DiskPool
1394-from lp.buildmaster.interfaces.buildbase import BuildStatus
1395+from lp.buildmaster.enums import BuildStatus
1396 from lp.registry.interfaces.distribution import IDistributionSet
1397 from lp.registry.interfaces.distroseries import IDistroSeriesSet
1398 from lp.registry.interfaces.person import IPersonSet
1399
1400=== modified file 'lib/lp/soyuz/tests/test_publishing_models.py'
1401--- lib/lp/soyuz/tests/test_publishing_models.py 2010-08-20 20:31:18 +0000
1402+++ lib/lp/soyuz/tests/test_publishing_models.py 2010-08-30 02:12:47 +0000
1403@@ -8,7 +8,7 @@
1404
1405 from canonical.database.constants import UTC_NOW
1406 from canonical.testing import LaunchpadZopelessLayer
1407-from lp.buildmaster.interfaces.buildbase import BuildStatus
1408+from lp.buildmaster.enums import BuildStatus
1409 from lp.soyuz.interfaces.publishing import (
1410 IPublishingSet,
1411 PackagePublishingStatus,
1412
1413=== modified file 'lib/lp/testing/factory.py'
1414--- lib/lp/testing/factory.py 2010-08-27 04:24:55 +0000
1415+++ lib/lp/testing/factory.py 2010-08-30 02:12:47 +0000
1416@@ -110,9 +110,11 @@
1417 IBugTrackerSet,
1418 )
1419 from lp.bugs.interfaces.bugwatch import IBugWatchSet
1420-from lp.buildmaster.interfaces.buildbase import BuildStatus
1421+from lp.buildmaster.enums import (
1422+ BuildFarmJobType,
1423+ BuildStatus,
1424+ )
1425 from lp.buildmaster.interfaces.builder import IBuilderSet
1426-from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
1427 from lp.buildmaster.model.buildqueue import BuildQueue
1428 from lp.code.enums import (
1429 BranchMergeProposalStatus,
1430
1431=== modified file 'lib/lp/testing/tests/test_factory.py'
1432--- lib/lp/testing/tests/test_factory.py 2010-08-24 15:29:01 +0000
1433+++ lib/lp/testing/tests/test_factory.py 2010-08-30 02:12:47 +0000
1434@@ -17,7 +17,7 @@
1435 DatabaseFunctionalLayer,
1436 LaunchpadZopelessLayer,
1437 )
1438-from lp.buildmaster.interfaces.buildbase import BuildStatus
1439+from lp.buildmaster.enums import BuildStatus
1440 from lp.code.enums import (
1441 BranchType,
1442 CodeImportReviewStatus,
1443
1444=== modified file 'lib/lp/translations/model/translationtemplatesbuildjob.py'
1445--- lib/lp/translations/model/translationtemplatesbuildjob.py 2010-08-25 09:27:12 +0000
1446+++ lib/lp/translations/model/translationtemplatesbuildjob.py 2010-08-30 02:12:47 +0000
1447@@ -23,8 +23,8 @@
1448 IMasterStore,
1449 IStore,
1450 )
1451+from lp.buildmaster.enums import BuildFarmJobType
1452 from lp.buildmaster.interfaces.buildfarmbranchjob import IBuildFarmBranchJob
1453-from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
1454 from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
1455 from lp.buildmaster.model.buildfarmjob import (
1456 BuildFarmJobOld,
1457
1458=== modified file 'lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py'
1459--- lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py 2010-08-20 20:31:18 +0000
1460+++ lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py 2010-08-30 02:12:47 +0000
1461@@ -16,7 +16,7 @@
1462 from canonical.launchpad.interfaces import ILaunchpadCelebrities
1463 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
1464 from canonical.testing import LaunchpadZopelessLayer
1465-from lp.buildmaster.interfaces.buildbase import BuildStatus
1466+from lp.buildmaster.enums import BuildStatus
1467 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
1468 IBuildFarmJobBehavior,
1469 )
1470
1471=== modified file 'scripts/ftpmaster-tools/buildd-mass-retry.py'
1472--- scripts/ftpmaster-tools/buildd-mass-retry.py 2010-08-02 23:29:05 +0000
1473+++ scripts/ftpmaster-tools/buildd-mass-retry.py 2010-08-30 02:12:47 +0000
1474@@ -26,7 +26,7 @@
1475 from canonical.launchpad.scripts import (
1476 execute_zcml_for_scripts, logger_options, logger)
1477 from canonical.lp import initZopeless
1478-from lp.buildmaster.interfaces.buildbase import BuildStatus
1479+from lp.buildmaster.enums import BuildStatus
1480 from lp.registry.interfaces.distribution import IDistributionSet
1481 from lp.registry.interfaces.pocket import PackagePublishingPocket
1482