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
=== modified file 'lib/canonical/launchpad/doc/tales.txt'
--- lib/canonical/launchpad/doc/tales.txt 2010-08-24 11:31:13 +0000
+++ lib/canonical/launchpad/doc/tales.txt 2010-08-30 02:12:47 +0000
@@ -197,7 +197,7 @@
197197
198The 'building' build is 14x14:198The 'building' build is 14x14:
199199
200 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus200 >>> from lp.buildmaster.enums import BuildStatus
201 >>> from zope.security.proxy import removeSecurityProxy201 >>> from zope.security.proxy import removeSecurityProxy
202 >>> removeSecurityProxy(build).status = BuildStatus.BUILDING202 >>> removeSecurityProxy(build).status = BuildStatus.BUILDING
203 >>> print test_tales("build/image:icon", build=build)203 >>> print test_tales("build/image:icon", build=build)
204204
=== modified file 'lib/canonical/launchpad/interfaces/_schema_circular_imports.py'
--- lib/canonical/launchpad/interfaces/_schema_circular_imports.py 2010-08-24 15:29:01 +0000
+++ lib/canonical/launchpad/interfaces/_schema_circular_imports.py 2010-08-30 02:12:47 +0000
@@ -47,7 +47,7 @@
47from lp.bugs.interfaces.bugtask import IBugTask47from lp.bugs.interfaces.bugtask import IBugTask
48from lp.bugs.interfaces.bugtracker import IBugTracker48from lp.bugs.interfaces.bugtracker import IBugTracker
49from lp.bugs.interfaces.bugwatch import IBugWatch49from lp.bugs.interfaces.bugwatch import IBugWatch
50from lp.buildmaster.interfaces.buildbase import BuildStatus50from lp.buildmaster.enums import BuildStatus
51from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob51from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
52from lp.buildmaster.interfaces.buildqueue import IBuildQueue52from lp.buildmaster.interfaces.buildqueue import IBuildQueue
53from lp.code.interfaces.branch import IBranch53from lp.code.interfaces.branch import IBranch
5454
=== modified file 'lib/canonical/launchpad/webapp/tales.py'
--- lib/canonical/launchpad/webapp/tales.py 2010-08-23 16:51:11 +0000
+++ lib/canonical/launchpad/webapp/tales.py 2010-08-30 02:12:47 +0000
@@ -58,7 +58,7 @@
58from canonical.lazr.canonicalurl import nearest_adapter58from canonical.lazr.canonicalurl import nearest_adapter
59from lp.app.browser.stringformatter import escape, FormattersAPI59from lp.app.browser.stringformatter import escape, FormattersAPI
60from lp.blueprints.interfaces.specification import ISpecification60from lp.blueprints.interfaces.specification import ISpecification
61from lp.buildmaster.interfaces.buildbase import BuildStatus61from lp.buildmaster.enums import BuildStatus
62from lp.code.interfaces.branch import IBranch62from lp.code.interfaces.branch import IBranch
63from lp.soyuz.enums import ArchivePurpose63from lp.soyuz.enums import ArchivePurpose
64from lp.soyuz.interfaces.archive import IPPA64from lp.soyuz.interfaces.archive import IPPA
6565
=== modified file 'lib/lp/archiveuploader/dscfile.py'
--- lib/lp/archiveuploader/dscfile.py 2010-08-25 11:01:59 +0000
+++ lib/lp/archiveuploader/dscfile.py 2010-08-30 02:12:47 +0000
@@ -58,7 +58,7 @@
58 re_valid_version,58 re_valid_version,
59 safe_fix_maintainer,59 safe_fix_maintainer,
60 )60 )
61from lp.buildmaster.interfaces.buildbase import BuildStatus61from lp.buildmaster.enums import BuildStatus
62from lp.code.interfaces.sourcepackagerecipebuild import (62from lp.code.interfaces.sourcepackagerecipebuild import (
63 ISourcePackageRecipeBuildSource,63 ISourcePackageRecipeBuildSource,
64 )64 )
6565
=== modified file 'lib/lp/archiveuploader/nascentuploadfile.py'
--- lib/lp/archiveuploader/nascentuploadfile.py 2010-08-26 08:02:08 +0000
+++ lib/lp/archiveuploader/nascentuploadfile.py 2010-08-30 02:12:47 +0000
@@ -44,7 +44,7 @@
44 re_valid_pkg_name,44 re_valid_pkg_name,
45 re_valid_version,45 re_valid_version,
46 )46 )
47from lp.buildmaster.interfaces.buildbase import BuildStatus47from lp.buildmaster.enums import BuildStatus
48from lp.soyuz.enums import (48from lp.soyuz.enums import (
49 BinaryPackageFormat,49 BinaryPackageFormat,
50 PackagePublishingPriority,50 PackagePublishingPriority,
5151
=== modified file 'lib/lp/archiveuploader/tests/test_recipeuploads.py'
--- lib/lp/archiveuploader/tests/test_recipeuploads.py 2010-08-24 12:25:48 +0000
+++ lib/lp/archiveuploader/tests/test_recipeuploads.py 2010-08-30 02:12:47 +0000
@@ -13,7 +13,7 @@
13from lp.archiveuploader.tests.test_uploadprocessor import (13from lp.archiveuploader.tests.test_uploadprocessor import (
14 TestUploadProcessorBase,14 TestUploadProcessorBase,
15 )15 )
16from lp.buildmaster.interfaces.buildbase import BuildStatus16from lp.buildmaster.enums import BuildStatus
17from lp.code.interfaces.sourcepackagerecipebuild import (17from lp.code.interfaces.sourcepackagerecipebuild import (
18 ISourcePackageRecipeBuildSource,18 ISourcePackageRecipeBuildSource,
19 )19 )
2020
=== modified file 'lib/lp/archiveuploader/tests/test_uploadprocessor.py'
--- lib/lp/archiveuploader/tests/test_uploadprocessor.py 2010-08-24 13:56:22 +0000
+++ lib/lp/archiveuploader/tests/test_uploadprocessor.py 2010-08-30 02:12:47 +0000
@@ -41,7 +41,7 @@
41 parse_build_upload_leaf_name,41 parse_build_upload_leaf_name,
42 UploadProcessor,42 UploadProcessor,
43 )43 )
44from lp.buildmaster.interfaces.buildbase import BuildStatus44from lp.buildmaster.enums import BuildStatus
45from lp.registry.interfaces.distribution import IDistributionSet45from lp.registry.interfaces.distribution import IDistributionSet
46from lp.registry.interfaces.person import IPersonSet46from lp.registry.interfaces.person import IPersonSet
47from lp.registry.interfaces.pocket import PackagePublishingPocket47from lp.registry.interfaces.pocket import PackagePublishingPocket
4848
=== modified file 'lib/lp/archiveuploader/uploadprocessor.py'
--- lib/lp/archiveuploader/uploadprocessor.py 2010-08-20 20:31:18 +0000
+++ lib/lp/archiveuploader/uploadprocessor.py 2010-08-30 02:12:47 +0000
@@ -74,7 +74,7 @@
74 SOURCE_PACKAGE_RECIPE_UPLOAD_POLICY_NAME,74 SOURCE_PACKAGE_RECIPE_UPLOAD_POLICY_NAME,
75 UploadPolicyError,75 UploadPolicyError,
76 )76 )
77from lp.buildmaster.interfaces.buildbase import BuildStatus77from lp.buildmaster.enums import BuildStatus
78from lp.registry.interfaces.distribution import IDistributionSet78from lp.registry.interfaces.distribution import IDistributionSet
79from lp.registry.interfaces.person import IPersonSet79from lp.registry.interfaces.person import IPersonSet
80from lp.soyuz.interfaces.archive import (80from lp.soyuz.interfaces.archive import (
8181
=== modified file 'lib/lp/buildmaster/doc/buildfarmjob.txt'
--- lib/lp/buildmaster/doc/buildfarmjob.txt 2010-05-04 13:42:25 +0000
+++ lib/lp/buildmaster/doc/buildfarmjob.txt 2010-08-30 02:12:47 +0000
@@ -2,7 +2,8 @@
2============2============
33
4 >>> from lp.buildmaster.interfaces.buildfarmjob import (4 >>> from lp.buildmaster.interfaces.buildfarmjob import (
5 ... BuildFarmJobType, IBuildFarmJob)5 ... IBuildFarmJob)
6 >>> from lp.buildmaster.enums import BuildFarmJobType
6 >>> from lp.buildmaster.model.buildfarmjob import (7 >>> from lp.buildmaster.model.buildfarmjob import (
7 ... BuildFarmJob, BuildFarmJobDerived)8 ... BuildFarmJob, BuildFarmJobDerived)
89
910
=== added file 'lib/lp/buildmaster/enums.py'
--- lib/lp/buildmaster/enums.py 1970-01-01 00:00:00 +0000
+++ lib/lp/buildmaster/enums.py 2010-08-30 02:12:47 +0000
@@ -0,0 +1,133 @@
1# Copyright 2009-2010 Canonical Ltd. This software is licensed under the
2# GNU Affero General Public License version 3 (see the file LICENSE).
3
4# pylint: disable-msg=E0211,E0213
5
6"""Common build interfaces."""
7
8__metaclass__ = type
9
10__all__ = [
11 'BuildStatus',
12 'BuildFarmJobType',
13 ]
14
15from lazr.enum import (
16 DBEnumeratedType,
17 DBItem,
18 )
19
20
21class BuildStatus(DBEnumeratedType):
22 """Build status type
23
24 Builds exist in the database in a number of states such as 'complete',
25 'needs build' and 'dependency wait'. We need to track these states in
26 order to correctly manage the autobuilder queues in the BuildQueue table.
27 """
28
29 NEEDSBUILD = DBItem(0, """
30 Needs building
31
32 Build record is fresh and needs building. Nothing is yet known to
33 block this build and it is a candidate for building on any free
34 builder of the relevant architecture
35 """)
36
37 FULLYBUILT = DBItem(1, """
38 Successfully built
39
40 Build record is an historic account of the build. The build is complete
41 and needs no further work to complete it. The build log etc are all
42 in place if available.
43 """)
44
45 FAILEDTOBUILD = DBItem(2, """
46 Failed to build
47
48 Build record is an historic account of the build. The build failed and
49 cannot be automatically retried. Either a new upload will be needed
50 or the build will have to be manually reset into 'NEEDSBUILD' when
51 the issue is corrected
52 """)
53
54 MANUALDEPWAIT = DBItem(3, """
55 Dependency wait
56
57 Build record represents a package whose build dependencies cannot
58 currently be satisfied within the relevant DistroArchSeries. This
59 build will have to be manually given back (put into 'NEEDSBUILD') when
60 the dependency issue is resolved.
61 """)
62
63 CHROOTWAIT = DBItem(4, """
64 Chroot problem
65
66 Build record represents a build which needs a chroot currently known
67 to be damaged or bad in some way. The buildd maintainer will have to
68 reset all relevant CHROOTWAIT builds to NEEDSBUILD after the chroot
69 has been fixed.
70 """)
71
72 SUPERSEDED = DBItem(5, """
73 Build for superseded Source
74
75 Build record represents a build which never got to happen because the
76 source package release for the build was superseded before the job
77 was scheduled to be run on a builder. Builds which reach this state
78 will rarely if ever be reset to any other state.
79 """)
80
81 BUILDING = DBItem(6, """
82 Currently building
83
84 Build record represents a build which is being build by one of the
85 available builders.
86 """)
87
88 FAILEDTOUPLOAD = DBItem(7, """
89 Failed to upload
90
91 Build record is an historic account of a build that could not be
92 uploaded correctly. It's mainly genereated by failures in
93 process-upload which quietly rejects the binary upload resulted
94 by the build procedure.
95 In those cases all the build historic information will be stored (
96 buildlog, datebuilt, duration, builder, etc) and the buildd admins
97 will be notified via process-upload about the reason of the rejection.
98 """)
99
100
101class BuildFarmJobType(DBEnumeratedType):
102 """Soyuz build farm job type.
103
104 An enumeration with the types of jobs that may be run on the Soyuz build
105 farm.
106 """
107
108 PACKAGEBUILD = DBItem(1, """
109 Binary package build
110
111 Build a source package.
112 """)
113
114 BRANCHBUILD = DBItem(2, """
115 Branch build
116
117 Build a package from a bazaar branch.
118 """)
119
120 RECIPEBRANCHBUILD = DBItem(3, """
121 Recipe branch build
122
123 Build a package from a bazaar branch and a recipe.
124 """)
125
126 TRANSLATIONTEMPLATESBUILD = DBItem(4, """
127 Translation template build
128
129 Generate translation templates from a bazaar branch.
130 """)
131
132
133
0134
=== removed file 'lib/lp/buildmaster/interfaces/buildbase.py'
--- lib/lp/buildmaster/interfaces/buildbase.py 2010-08-24 09:51:26 +0000
+++ lib/lp/buildmaster/interfaces/buildbase.py 1970-01-01 00:00:00 +0000
@@ -1,101 +0,0 @@
1# Copyright 2009 Canonical Ltd. This software is licensed under the
2# GNU Affero General Public License version 3 (see the file LICENSE).
3
4# pylint: disable-msg=E0211,E0213
5
6"""Common build interfaces."""
7
8__metaclass__ = type
9
10__all__ = [
11 'BUILDD_MANAGER_LOG_NAME',
12 'BuildStatus',
13 ]
14
15from lazr.enum import (
16 DBEnumeratedType,
17 DBItem,
18 )
19
20
21BUILDD_MANAGER_LOG_NAME = "slave-scanner"
22
23
24class BuildStatus(DBEnumeratedType):
25 """Build status type
26
27 Builds exist in the database in a number of states such as 'complete',
28 'needs build' and 'dependency wait'. We need to track these states in
29 order to correctly manage the autobuilder queues in the BuildQueue table.
30 """
31
32 NEEDSBUILD = DBItem(0, """
33 Needs building
34
35 Build record is fresh and needs building. Nothing is yet known to
36 block this build and it is a candidate for building on any free
37 builder of the relevant architecture
38 """)
39
40 FULLYBUILT = DBItem(1, """
41 Successfully built
42
43 Build record is an historic account of the build. The build is complete
44 and needs no further work to complete it. The build log etc are all
45 in place if available.
46 """)
47
48 FAILEDTOBUILD = DBItem(2, """
49 Failed to build
50
51 Build record is an historic account of the build. The build failed and
52 cannot be automatically retried. Either a new upload will be needed
53 or the build will have to be manually reset into 'NEEDSBUILD' when
54 the issue is corrected
55 """)
56
57 MANUALDEPWAIT = DBItem(3, """
58 Dependency wait
59
60 Build record represents a package whose build dependencies cannot
61 currently be satisfied within the relevant DistroArchSeries. This
62 build will have to be manually given back (put into 'NEEDSBUILD') when
63 the dependency issue is resolved.
64 """)
65
66 CHROOTWAIT = DBItem(4, """
67 Chroot problem
68
69 Build record represents a build which needs a chroot currently known
70 to be damaged or bad in some way. The buildd maintainer will have to
71 reset all relevant CHROOTWAIT builds to NEEDSBUILD after the chroot
72 has been fixed.
73 """)
74
75 SUPERSEDED = DBItem(5, """
76 Build for superseded Source
77
78 Build record represents a build which never got to happen because the
79 source package release for the build was superseded before the job
80 was scheduled to be run on a builder. Builds which reach this state
81 will rarely if ever be reset to any other state.
82 """)
83
84 BUILDING = DBItem(6, """
85 Currently building
86
87 Build record represents a build which is being build by one of the
88 available builders.
89 """)
90
91 FAILEDTOUPLOAD = DBItem(7, """
92 Failed to upload
93
94 Build record is an historic account of a build that could not be
95 uploaded correctly. It's mainly genereated by failures in
96 process-upload which quietly rejects the binary upload resulted
97 by the build procedure.
98 In those cases all the build historic information will be stored (
99 buildlog, datebuilt, duration, builder, etc) and the buildd admins
100 will be notified via process-upload about the reason of the rejection.
101 """)
1020
=== modified file 'lib/lp/buildmaster/interfaces/buildfarmjob.py'
--- lib/lp/buildmaster/interfaces/buildfarmjob.py 2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/interfaces/buildfarmjob.py 2010-08-30 02:12:47 +0000
@@ -14,12 +14,10 @@
14 'IBuildFarmJobSource',14 'IBuildFarmJobSource',
15 'InconsistentBuildFarmJobError',15 'InconsistentBuildFarmJobError',
16 'ISpecificBuildFarmJob',16 'ISpecificBuildFarmJob',
17 'BuildFarmJobType',
18 ]17 ]
1918
20from lazr.enum import (19from lazr.enum import (
21 DBEnumeratedType,20 DBEnumeratedType,
22 DBItem,
23 )21 )
24from lazr.restful.declarations import exported22from lazr.restful.declarations import exported
25from lazr.restful.fields import Reference23from lazr.restful.fields import Reference
@@ -37,6 +35,7 @@
3735
38from canonical.launchpad import _36from canonical.launchpad import _
39from canonical.launchpad.interfaces.librarian import ILibraryFileAlias37from canonical.launchpad.interfaces.librarian import ILibraryFileAlias
38from lp.buildmaster.enums import BuildFarmJobType
40from lp.buildmaster.interfaces.builder import IBuilder39from lp.buildmaster.interfaces.builder import IBuilder
41from lp.soyuz.interfaces.processor import IProcessor40from lp.soyuz.interfaces.processor import IProcessor
4241
@@ -50,38 +49,6 @@
50 """49 """
5150
5251
53class BuildFarmJobType(DBEnumeratedType):
54 """Soyuz build farm job type.
55
56 An enumeration with the types of jobs that may be run on the Soyuz build
57 farm.
58 """
59
60 PACKAGEBUILD = DBItem(1, """
61 Binary package build
62
63 Build a source package.
64 """)
65
66 BRANCHBUILD = DBItem(2, """
67 Branch build
68
69 Build a package from a bazaar branch.
70 """)
71
72 RECIPEBRANCHBUILD = DBItem(3, """
73 Recipe branch build
74
75 Build a package from a bazaar branch and a recipe.
76 """)
77
78 TRANSLATIONTEMPLATESBUILD = DBItem(4, """
79 Translation template build
80
81 Generate translation templates from a bazaar branch.
82 """)
83
84
85class IBuildFarmJobOld(Interface):52class IBuildFarmJobOld(Interface):
86 """Defines the previous non-database BuildFarmJob interface.53 """Defines the previous non-database BuildFarmJob interface.
8754
8855
=== modified file 'lib/lp/buildmaster/interfaces/buildqueue.py'
--- lib/lp/buildmaster/interfaces/buildqueue.py 2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/interfaces/buildqueue.py 2010-08-30 02:12:47 +0000
@@ -28,9 +28,9 @@
28 )28 )
2929
30from canonical.launchpad import _30from canonical.launchpad import _
31from lp.buildmaster.enums import BuildFarmJobType
31from lp.buildmaster.interfaces.builder import IBuilder32from lp.buildmaster.interfaces.builder import IBuilder
32from lp.buildmaster.interfaces.buildfarmjob import (33from lp.buildmaster.interfaces.buildfarmjob import (
33 BuildFarmJobType,
34 IBuildFarmJob,34 IBuildFarmJob,
35 )35 )
36from lp.services.job.interfaces.job import IJob36from lp.services.job.interfaces.job import IJob
3737
=== modified file 'lib/lp/buildmaster/interfaces/packagebuild.py'
--- lib/lp/buildmaster/interfaces/packagebuild.py 2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/interfaces/packagebuild.py 2010-08-30 02:12:47 +0000
@@ -24,7 +24,7 @@
2424
25from canonical.launchpad import _25from canonical.launchpad import _
26from canonical.launchpad.interfaces.librarian import ILibraryFileAlias26from canonical.launchpad.interfaces.librarian import ILibraryFileAlias
27from lp.buildmaster.interfaces.buildbase import BuildStatus27from lp.buildmaster.enums import BuildStatus
28from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob28from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
29from lp.registry.interfaces.distribution import IDistribution29from lp.registry.interfaces.distribution import IDistribution
30from lp.registry.interfaces.distroseries import IDistroSeries30from lp.registry.interfaces.distroseries import IDistroSeries
3131
=== modified file 'lib/lp/buildmaster/manager.py'
--- lib/lp/buildmaster/manager.py 2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/manager.py 2010-08-30 02:12:47 +0000
@@ -8,6 +8,7 @@
8__all__ = [8__all__ = [
9 'BaseDispatchResult',9 'BaseDispatchResult',
10 'BuilddManager',10 'BuilddManager',
11 'BUILDD_MANAGER_LOG_NAME',
11 'FailDispatchResult',12 'FailDispatchResult',
12 'RecordingSlave',13 'RecordingSlave',
13 'ResetDispatchResult',14 'ResetDispatchResult',
@@ -32,10 +33,12 @@
32from canonical.config import config33from canonical.config import config
33from canonical.launchpad.webapp import urlappend34from canonical.launchpad.webapp import urlappend
34from canonical.librarian.db import write_transaction35from canonical.librarian.db import write_transaction
35from lp.buildmaster.interfaces.buildbase import BUILDD_MANAGER_LOG_NAME
36from lp.services.twistedsupport.processmonitor import ProcessWithTimeout36from lp.services.twistedsupport.processmonitor import ProcessWithTimeout
3737
3838
39BUILDD_MANAGER_LOG_NAME = "slave-scanner"
40
41
39buildd_success_result_map = {42buildd_success_result_map = {
40 'ensurepresent': True,43 'ensurepresent': True,
41 'build': 'BuilderStatus.BUILDING',44 'build': 'BuilderStatus.BUILDING',
4245
=== modified file 'lib/lp/buildmaster/model/buildfarmjob.py'
--- lib/lp/buildmaster/model/buildfarmjob.py 2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/model/buildfarmjob.py 2010-08-30 02:12:47 +0000
@@ -52,9 +52,9 @@
52 IStoreSelector,52 IStoreSelector,
53 MAIN_STORE,53 MAIN_STORE,
54 )54 )
55from lp.buildmaster.interfaces.buildbase import BuildStatus55from lp.buildmaster.enums import BuildStatus
56from lp.buildmaster.enums import BuildFarmJobType
56from lp.buildmaster.interfaces.buildfarmjob import (57from lp.buildmaster.interfaces.buildfarmjob import (
57 BuildFarmJobType,
58 IBuildFarmJob,58 IBuildFarmJob,
59 IBuildFarmJobOld,59 IBuildFarmJobOld,
60 IBuildFarmJobSet,60 IBuildFarmJobSet,
6161
=== modified file 'lib/lp/buildmaster/model/buildqueue.py'
--- lib/lp/buildmaster/model/buildqueue.py 2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/model/buildqueue.py 2010-08-30 02:12:47 +0000
@@ -45,8 +45,8 @@
45 MAIN_STORE,45 MAIN_STORE,
46 )46 )
47from lp.app.errors import NotFoundError47from lp.app.errors import NotFoundError
48from lp.buildmaster.enums import BuildFarmJobType
48from lp.buildmaster.interfaces.buildfarmjob import (49from lp.buildmaster.interfaces.buildfarmjob import (
49 BuildFarmJobType,
50 IBuildFarmJob,50 IBuildFarmJob,
51 )51 )
52from lp.buildmaster.interfaces.buildfarmjobbehavior import (52from lp.buildmaster.interfaces.buildfarmjobbehavior import (
5353
=== modified file 'lib/lp/buildmaster/model/packagebuild.py'
--- lib/lp/buildmaster/model/packagebuild.py 2010-08-25 13:30:06 +0000
+++ lib/lp/buildmaster/model/packagebuild.py 2010-08-30 02:12:47 +0000
@@ -51,10 +51,7 @@
51 MAIN_STORE,51 MAIN_STORE,
52 )52 )
53from canonical.librarian.utils import copy_and_close53from canonical.librarian.utils import copy_and_close
54from lp.buildmaster.interfaces.buildbase import (54from lp.buildmaster.enums import BuildStatus
55 BUILDD_MANAGER_LOG_NAME,
56 BuildStatus,
57 )
58from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJobSource55from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJobSource
59from lp.buildmaster.interfaces.packagebuild import (56from lp.buildmaster.interfaces.packagebuild import (
60 IPackageBuild,57 IPackageBuild,
@@ -68,7 +65,6 @@
68from lp.buildmaster.model.buildqueue import BuildQueue65from lp.buildmaster.model.buildqueue import BuildQueue
69from lp.registry.interfaces.pocket import (66from lp.registry.interfaces.pocket import (
70 PackagePublishingPocket,67 PackagePublishingPocket,
71 pocketsuffix,
72 )68 )
73from lp.soyuz.adapters.archivedependencies import (69from lp.soyuz.adapters.archivedependencies import (
74 default_component_dependency_name,70 default_component_dependency_name,
@@ -317,6 +313,7 @@
317313
318 def handleStatus(self, status, librarian, slave_status):314 def handleStatus(self, status, librarian, slave_status):
319 """See `IPackageBuild`."""315 """See `IPackageBuild`."""
316 from lp.buildmaster.manager import BUILDD_MANAGER_LOG_NAME
320 logger = logging.getLogger(BUILDD_MANAGER_LOG_NAME)317 logger = logging.getLogger(BUILDD_MANAGER_LOG_NAME)
321 method = getattr(self, '_handleStatus_' + status, None)318 method = getattr(self, '_handleStatus_' + status, None)
322 if method is None:319 if method is None:
323320
=== modified file 'lib/lp/buildmaster/tests/test_builder.py'
--- lib/lp/buildmaster/tests/test_builder.py 2010-08-25 11:01:59 +0000
+++ lib/lp/buildmaster/tests/test_builder.py 2010-08-30 02:12:47 +0000
@@ -15,7 +15,7 @@
15 MAIN_STORE,15 MAIN_STORE,
16 )16 )
17from canonical.testing import LaunchpadZopelessLayer17from canonical.testing import LaunchpadZopelessLayer
18from lp.buildmaster.interfaces.buildbase import BuildStatus18from lp.buildmaster.enums import BuildStatus
19from lp.buildmaster.interfaces.builder import IBuilderSet19from lp.buildmaster.interfaces.builder import IBuilderSet
20from lp.buildmaster.interfaces.buildfarmjobbehavior import (20from lp.buildmaster.interfaces.buildfarmjobbehavior import (
21 IBuildFarmJobBehavior,21 IBuildFarmJobBehavior,
2222
=== modified file 'lib/lp/buildmaster/tests/test_buildfarmjob.py'
--- lib/lp/buildmaster/tests/test_buildfarmjob.py 2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/tests/test_buildfarmjob.py 2010-08-30 02:12:47 +0000
@@ -22,9 +22,11 @@
22 DatabaseFunctionalLayer,22 DatabaseFunctionalLayer,
23 LaunchpadFunctionalLayer,23 LaunchpadFunctionalLayer,
24 )24 )
25from lp.buildmaster.interfaces.buildbase import BuildStatus25from lp.buildmaster.enums import (
26 BuildFarmJobType,
27 BuildStatus,
28 )
26from lp.buildmaster.interfaces.buildfarmjob import (29from lp.buildmaster.interfaces.buildfarmjob import (
27 BuildFarmJobType,
28 IBuildFarmJob,30 IBuildFarmJob,
29 IBuildFarmJobSet,31 IBuildFarmJobSet,
30 IBuildFarmJobSource,32 IBuildFarmJobSource,
3133
=== modified file 'lib/lp/buildmaster/tests/test_buildfarmjobbehavior.py'
--- lib/lp/buildmaster/tests/test_buildfarmjobbehavior.py 2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/tests/test_buildfarmjobbehavior.py 2010-08-30 02:12:47 +0000
@@ -7,7 +7,7 @@
7from zope.security.proxy import removeSecurityProxy7from zope.security.proxy import removeSecurityProxy
88
9from canonical.testing.layers import ZopelessDatabaseLayer9from canonical.testing.layers import ZopelessDatabaseLayer
10from lp.buildmaster.interfaces.buildbase import BuildStatus10from lp.buildmaster.enums import BuildStatus
11from lp.buildmaster.interfaces.builder import CorruptBuildCookie11from lp.buildmaster.interfaces.builder import CorruptBuildCookie
12from lp.buildmaster.model.buildfarmjobbehavior import BuildFarmJobBehaviorBase12from lp.buildmaster.model.buildfarmjobbehavior import BuildFarmJobBehaviorBase
13from lp.registry.interfaces.pocket import PackagePublishingPocket13from lp.registry.interfaces.pocket import PackagePublishingPocket
1414
=== modified file 'lib/lp/buildmaster/tests/test_buildqueue.py'
--- lib/lp/buildmaster/tests/test_buildqueue.py 2010-08-24 15:29:01 +0000
+++ lib/lp/buildmaster/tests/test_buildqueue.py 2010-08-30 02:12:47 +0000
@@ -27,12 +27,12 @@
27 LaunchpadZopelessLayer,27 LaunchpadZopelessLayer,
28 ZopelessDatabaseLayer,28 ZopelessDatabaseLayer,
29 )29 )
30from lp.buildmaster.interfaces.buildbase import BuildStatus30from lp.buildmaster.enums import (
31 BuildFarmJobType,
32 BuildStatus,
33 )
31from lp.buildmaster.interfaces.builder import IBuilderSet34from lp.buildmaster.interfaces.builder import IBuilderSet
32from lp.buildmaster.interfaces.buildfarmjob import (35from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
33 BuildFarmJobType,
34 IBuildFarmJob,
35 )
36from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet36from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
37from lp.buildmaster.model.builder import specific_job_classes37from lp.buildmaster.model.builder import specific_job_classes
38from lp.buildmaster.model.buildfarmjob import BuildFarmJobDerived38from lp.buildmaster.model.buildfarmjob import BuildFarmJobDerived
3939
=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
--- lib/lp/buildmaster/tests/test_manager.py 2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/tests/test_manager.py 2010-08-30 02:12:47 +0000
@@ -36,7 +36,7 @@
36 LaunchpadZopelessLayer,36 LaunchpadZopelessLayer,
37 TwistedLayer,37 TwistedLayer,
38 )38 )
39from lp.buildmaster.interfaces.buildbase import BuildStatus39from lp.buildmaster.enums import BuildStatus
40from lp.buildmaster.interfaces.builder import IBuilderSet40from lp.buildmaster.interfaces.builder import IBuilderSet
41from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet41from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
42from lp.buildmaster.manager import (42from lp.buildmaster.manager import (
4343
=== modified file 'lib/lp/buildmaster/tests/test_packagebuild.py'
--- lib/lp/buildmaster/tests/test_packagebuild.py 2010-08-24 12:16:10 +0000
+++ lib/lp/buildmaster/tests/test_packagebuild.py 2010-08-30 02:12:47 +0000
@@ -20,8 +20,10 @@
20 LaunchpadFunctionalLayer,20 LaunchpadFunctionalLayer,
21 LaunchpadZopelessLayer,21 LaunchpadZopelessLayer,
22 )22 )
23from lp.buildmaster.interfaces.buildbase import BuildStatus23from lp.buildmaster.enums import (
24from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType24 BuildFarmJobType,
25 BuildStatus,
26 )
25from lp.buildmaster.interfaces.packagebuild import (27from lp.buildmaster.interfaces.packagebuild import (
26 IPackageBuild,28 IPackageBuild,
27 IPackageBuildSet,29 IPackageBuildSet,
2830
=== modified file 'lib/lp/code/browser/sourcepackagerecipebuild.py'
--- lib/lp/code/browser/sourcepackagerecipebuild.py 2010-08-20 20:31:18 +0000
+++ lib/lp/code/browser/sourcepackagerecipebuild.py 2010-08-30 02:12:47 +0000
@@ -27,7 +27,7 @@
27 Link,27 Link,
28 Navigation,28 Navigation,
29 )29 )
30from lp.buildmaster.interfaces.buildbase import BuildStatus30from lp.buildmaster.enums import BuildStatus
31from lp.code.interfaces.sourcepackagerecipebuild import (31from lp.code.interfaces.sourcepackagerecipebuild import (
32 ISourcePackageRecipeBuild,32 ISourcePackageRecipeBuild,
33 )33 )
3434
=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py 2010-08-20 20:31:18 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py 2010-08-30 02:12:47 +0000
@@ -31,7 +31,7 @@
31 DatabaseFunctionalLayer,31 DatabaseFunctionalLayer,
32 LaunchpadFunctionalLayer,32 LaunchpadFunctionalLayer,
33 )33 )
34from lp.buildmaster.interfaces.buildbase import BuildStatus34from lp.buildmaster.enums import BuildStatus
35from lp.code.browser.sourcepackagerecipe import (35from lp.code.browser.sourcepackagerecipe import (
36 SourcePackageRecipeRequestBuildsView,36 SourcePackageRecipeRequestBuildsView,
37 SourcePackageRecipeView,37 SourcePackageRecipeView,
3838
=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipebuild.py 2010-08-20 20:31:18 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipebuild.py 2010-08-30 02:12:47 +0000
@@ -21,7 +21,7 @@
21 )21 )
22from canonical.launchpad.webapp import canonical_url22from canonical.launchpad.webapp import canonical_url
23from canonical.testing import DatabaseFunctionalLayer23from canonical.testing import DatabaseFunctionalLayer
24from lp.buildmaster.interfaces.buildbase import BuildStatus24from lp.buildmaster.enums import BuildStatus
25from lp.soyuz.model.processor import ProcessorFamily25from lp.soyuz.model.processor import ProcessorFamily
26from lp.testing import (26from lp.testing import (
27 ANONYMOUS,27 ANONYMOUS,
2828
=== modified file 'lib/lp/code/mail/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/code/mail/tests/test_sourcepackagerecipebuild.py 2010-08-20 20:31:18 +0000
+++ lib/lp/code/mail/tests/test_sourcepackagerecipebuild.py 2010-08-30 02:12:47 +0000
@@ -13,7 +13,7 @@
1313
14from canonical.config import config14from canonical.config import config
15from canonical.testing import LaunchpadFunctionalLayer15from canonical.testing import LaunchpadFunctionalLayer
16from lp.buildmaster.interfaces.buildbase import BuildStatus16from lp.buildmaster.enums import BuildStatus
17from lp.code.mail.sourcepackagerecipebuild import (17from lp.code.mail.sourcepackagerecipebuild import (
18 SourcePackageRecipeBuildMailer,18 SourcePackageRecipeBuildMailer,
19 )19 )
2020
=== modified file 'lib/lp/code/model/sourcepackagerecipe.py'
--- lib/lp/code/model/sourcepackagerecipe.py 2010-08-23 16:51:11 +0000
+++ lib/lp/code/model/sourcepackagerecipe.py 2010-08-30 02:12:47 +0000
@@ -35,7 +35,7 @@
35 IMasterStore,35 IMasterStore,
36 IStore,36 IStore,
37 )37 )
38from lp.buildmaster.interfaces.buildbase import BuildStatus38from lp.buildmaster.enums import BuildStatus
39from lp.buildmaster.model.buildfarmjob import BuildFarmJob39from lp.buildmaster.model.buildfarmjob import BuildFarmJob
40from lp.buildmaster.model.packagebuild import PackageBuild40from lp.buildmaster.model.packagebuild import PackageBuild
41from lp.code.errors import (41from lp.code.errors import (
4242
=== modified file 'lib/lp/code/model/sourcepackagerecipebuild.py'
--- lib/lp/code/model/sourcepackagerecipebuild.py 2010-08-26 14:29:45 +0000
+++ lib/lp/code/model/sourcepackagerecipebuild.py 2010-08-30 02:12:47 +0000
@@ -45,8 +45,10 @@
45 IArchiveUploadPolicy,45 IArchiveUploadPolicy,
46 SOURCE_PACKAGE_RECIPE_UPLOAD_POLICY_NAME,46 SOURCE_PACKAGE_RECIPE_UPLOAD_POLICY_NAME,
47 )47 )
48from lp.buildmaster.interfaces.buildbase import BuildStatus48from lp.buildmaster.enums import (
49from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType49 BuildFarmJobType,
50 BuildStatus,
51 )
50from lp.buildmaster.model.buildfarmjob import BuildFarmJobOldDerived52from lp.buildmaster.model.buildfarmjob import BuildFarmJobOldDerived
51from lp.buildmaster.model.buildqueue import BuildQueue53from lp.buildmaster.model.buildqueue import BuildQueue
52from lp.buildmaster.model.packagebuild import (54from lp.buildmaster.model.packagebuild import (
5355
=== modified file 'lib/lp/code/model/tests/test_recipebuilder.py'
--- lib/lp/code/model/tests/test_recipebuilder.py 2010-08-20 20:31:18 +0000
+++ lib/lp/code/model/tests/test_recipebuilder.py 2010-08-30 02:12:47 +0000
@@ -16,8 +16,8 @@
1616
17from canonical.launchpad.scripts.logger import BufferLogger17from canonical.launchpad.scripts.logger import BufferLogger
18from canonical.testing import LaunchpadFunctionalLayer18from canonical.testing import LaunchpadFunctionalLayer
19from lp.buildmaster.enums import BuildFarmJobType
19from lp.buildmaster.interfaces.builder import CannotBuild20from lp.buildmaster.interfaces.builder import CannotBuild
20from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
21from lp.buildmaster.interfaces.buildfarmjobbehavior import (21from lp.buildmaster.interfaces.buildfarmjobbehavior import (
22 IBuildFarmJobBehavior,22 IBuildFarmJobBehavior,
23 )23 )
2424
=== modified file 'lib/lp/code/model/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/model/tests/test_sourcepackagerecipe.py 2010-08-23 16:51:11 +0000
+++ lib/lp/code/model/tests/test_sourcepackagerecipe.py 2010-08-30 02:12:47 +0000
@@ -28,7 +28,7 @@
28 AppServerLayer,28 AppServerLayer,
29 DatabaseFunctionalLayer,29 DatabaseFunctionalLayer,
30 )30 )
31from lp.buildmaster.interfaces.buildbase import BuildStatus31from lp.buildmaster.enums import BuildStatus
32from lp.buildmaster.interfaces.buildqueue import IBuildQueue32from lp.buildmaster.interfaces.buildqueue import IBuildQueue
33from lp.buildmaster.model.buildqueue import BuildQueue33from lp.buildmaster.model.buildqueue import BuildQueue
34from lp.code.errors import (34from lp.code.errors import (
3535
=== modified file 'lib/lp/code/model/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/code/model/tests/test_sourcepackagerecipebuild.py 2010-08-24 09:51:26 +0000
+++ lib/lp/code/model/tests/test_sourcepackagerecipebuild.py 2010-08-30 02:12:47 +0000
@@ -24,7 +24,7 @@
24 LaunchpadZopelessLayer,24 LaunchpadZopelessLayer,
25 )25 )
26from lp.app.errors import NotFoundError26from lp.app.errors import NotFoundError
27from lp.buildmaster.interfaces.buildbase import BuildStatus27from lp.buildmaster.enums import BuildStatus
28from lp.buildmaster.interfaces.buildqueue import IBuildQueue28from lp.buildmaster.interfaces.buildqueue import IBuildQueue
29from lp.buildmaster.tests.test_packagebuild import (29from lp.buildmaster.tests.test_packagebuild import (
30 TestGetUploadMethodsMixin,30 TestGetUploadMethodsMixin,
3131
=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py 2010-08-27 22:33:36 +0000
+++ lib/lp/registry/browser/person.py 2010-08-30 02:12:47 +0000
@@ -240,7 +240,7 @@
240 IBugTaskSet,240 IBugTaskSet,
241 UNRESOLVED_BUGTASK_STATUSES,241 UNRESOLVED_BUGTASK_STATUSES,
242 )242 )
243from lp.buildmaster.interfaces.buildbase import BuildStatus243from lp.buildmaster.enums import BuildStatus
244from lp.code.browser.sourcepackagerecipelisting import HasRecipesMenuMixin244from lp.code.browser.sourcepackagerecipelisting import HasRecipesMenuMixin
245from lp.code.errors import InvalidNamespace245from lp.code.errors import InvalidNamespace
246from lp.code.interfaces.branchnamespace import IBranchNamespaceSet246from lp.code.interfaces.branchnamespace import IBranchNamespaceSet
247247
=== modified file 'lib/lp/registry/browser/tests/test_person_view.py'
--- lib/lp/registry/browser/tests/test_person_view.py 2010-08-24 15:29:01 +0000
+++ lib/lp/registry/browser/tests/test_person_view.py 2010-08-30 02:12:47 +0000
@@ -20,7 +20,7 @@
20 LaunchpadZopelessLayer,20 LaunchpadZopelessLayer,
21 )21 )
22from lp.app.errors import NotFoundError22from lp.app.errors import NotFoundError
23from lp.buildmaster.interfaces.buildbase import BuildStatus23from lp.buildmaster.enums import BuildStatus
24from lp.registry.browser.person import (24from lp.registry.browser.person import (
25 PersonEditView,25 PersonEditView,
26 PersonView,26 PersonView,
2727
=== modified file 'lib/lp/registry/model/sourcepackage.py'
--- lib/lp/registry/model/sourcepackage.py 2010-08-24 15:29:01 +0000
+++ lib/lp/registry/model/sourcepackage.py 2010-08-30 02:12:47 +0000
@@ -50,7 +50,7 @@
50 HasBugHeatMixin,50 HasBugHeatMixin,
51 )51 )
52from lp.bugs.model.bugtask import BugTask52from lp.bugs.model.bugtask import BugTask
53from lp.buildmaster.interfaces.buildbase import BuildStatus53from lp.buildmaster.enums import BuildStatus
54from lp.code.interfaces.seriessourcepackagebranch import (54from lp.code.interfaces.seriessourcepackagebranch import (
55 IMakeOfficialBranchLinks,55 IMakeOfficialBranchLinks,
56 )56 )
5757
=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/browser/archive.py 2010-08-30 02:12:47 +0000
@@ -98,7 +98,7 @@
98from canonical.widgets.textwidgets import StrippedTextWidget98from canonical.widgets.textwidgets import StrippedTextWidget
99from lp.app.browser.stringformatter import FormattersAPI99from lp.app.browser.stringformatter import FormattersAPI
100from lp.app.errors import NotFoundError100from lp.app.errors import NotFoundError
101from lp.buildmaster.interfaces.buildbase import BuildStatus101from lp.buildmaster.enums import BuildStatus
102from lp.registry.interfaces.person import (102from lp.registry.interfaces.person import (
103 IPersonSet,103 IPersonSet,
104 PersonVisibility,104 PersonVisibility,
105105
=== modified file 'lib/lp/soyuz/browser/build.py'
--- lib/lp/soyuz/browser/build.py 2010-08-24 12:25:48 +0000
+++ lib/lp/soyuz/browser/build.py 2010-08-30 02:12:47 +0000
@@ -42,7 +42,7 @@
42from canonical.launchpad.webapp.interfaces import ICanonicalUrlData42from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
43from canonical.lazr.utils import safe_hasattr43from canonical.lazr.utils import safe_hasattr
44from lp.app.errors import UnexpectedFormData44from lp.app.errors import UnexpectedFormData
45from lp.buildmaster.interfaces.buildbase import BuildStatus45from lp.buildmaster.enums import BuildStatus
46from lp.services.job.interfaces.job import JobStatus46from lp.services.job.interfaces.job import JobStatus
47from lp.soyuz.interfaces.binarypackagebuild import (47from lp.soyuz.interfaces.binarypackagebuild import (
48 IBinaryPackageBuild,48 IBinaryPackageBuild,
4949
=== modified file 'lib/lp/soyuz/browser/tests/archive-views.txt'
--- lib/lp/soyuz/browser/tests/archive-views.txt 2010-08-23 16:51:11 +0000
+++ lib/lp/soyuz/browser/tests/archive-views.txt 2010-08-30 02:12:47 +0000
@@ -360,7 +360,7 @@
360360
361Let's set some builds appropriately to see the results.361Let's set some builds appropriately to see the results.
362362
363 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus363 >>> from lp.buildmaster.enums import BuildStatus
364 >>> from lp.soyuz.interfaces.binarypackagebuild import (364 >>> from lp.soyuz.interfaces.binarypackagebuild import (
365 ... IBinaryPackageBuildSet)365 ... IBinaryPackageBuildSet)
366 >>> warty_hppa = getUtility(IDistributionSet)['ubuntu']['warty']['hppa']366 >>> warty_hppa = getUtility(IDistributionSet)['ubuntu']['warty']['hppa']
367367
=== modified file 'lib/lp/soyuz/browser/tests/build-views.txt'
--- lib/lp/soyuz/browser/tests/build-views.txt 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/browser/tests/build-views.txt 2010-08-30 02:12:47 +0000
@@ -4,7 +4,7 @@
4from the sampledata which happens to be in FAILEDTOBUILD status.4from the sampledata which happens to be in FAILEDTOBUILD status.
55
6 >>> from zope.component import getUtility6 >>> from zope.component import getUtility
7 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus7 >>> from lp.buildmaster.enums import BuildStatus
8 >>> from lp.registry.interfaces.distribution import IDistributionSet8 >>> from lp.registry.interfaces.distribution import IDistributionSet
99
10 >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')10 >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
1111
=== modified file 'lib/lp/soyuz/browser/tests/builder-views.txt'
--- lib/lp/soyuz/browser/tests/builder-views.txt 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/browser/tests/builder-views.txt 2010-08-30 02:12:47 +0000
@@ -141,7 +141,7 @@
141SoyuzTestPublisher is used to make a new publication only in Celso's141SoyuzTestPublisher is used to make a new publication only in Celso's
142private PPA.142private PPA.
143143
144 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus144 >>> from lp.buildmaster.enums import BuildStatus
145 >>> from lp.soyuz.tests.test_publishing import (145 >>> from lp.soyuz.tests.test_publishing import (
146 ... SoyuzTestPublisher)146 ... SoyuzTestPublisher)
147 >>> from lp.soyuz.enums import (147 >>> from lp.soyuz.enums import (
148148
=== modified file 'lib/lp/soyuz/doc/archive.txt'
--- lib/lp/soyuz/doc/archive.txt 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/doc/archive.txt 2010-08-30 02:12:47 +0000
@@ -938,7 +938,7 @@
938be returned, but you can also ask for releases with builds in a certain938be returned, but you can also ask for releases with builds in a certain
939state.939state.
940940
941 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus941 >>> from lp.buildmaster.enums import BuildStatus
942 >>> releases = cprov_archive.getSourcePackageReleases(942 >>> releases = cprov_archive.getSourcePackageReleases(
943 ... build_status=BuildStatus.FULLYBUILT)943 ... build_status=BuildStatus.FULLYBUILT)
944 >>> for release in releases:944 >>> for release in releases:
945945
=== modified file 'lib/lp/soyuz/doc/binarypackagebuild.txt'
--- lib/lp/soyuz/doc/binarypackagebuild.txt 2010-08-25 12:57:29 +0000
+++ lib/lp/soyuz/doc/binarypackagebuild.txt 2010-08-30 02:12:47 +0000
@@ -136,7 +136,7 @@
136136
137If the build does not have any uploads, None is returned:137If the build does not have any uploads, None is returned:
138138
139 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus139 >>> from lp.buildmaster.enums import BuildStatus
140 >>> from lp.soyuz.interfaces.binarypackagebuild import (140 >>> from lp.soyuz.interfaces.binarypackagebuild import (
141 ... IBinaryPackageBuildSet)141 ... IBinaryPackageBuildSet)
142 >>> at_build = getUtility(IBinaryPackageBuildSet).getByBuildID(15)142 >>> at_build = getUtility(IBinaryPackageBuildSet).getByBuildID(15)
143143
=== modified file 'lib/lp/soyuz/doc/build-estimated-dispatch-time.txt'
--- lib/lp/soyuz/doc/build-estimated-dispatch-time.txt 2010-05-20 15:30:16 +0000
+++ lib/lp/soyuz/doc/build-estimated-dispatch-time.txt 2010-08-30 02:12:47 +0000
@@ -44,7 +44,7 @@
44the pending job.44the pending job.
4545
46 >>> from datetime import timedelta46 >>> from datetime import timedelta
47 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus47 >>> from lp.buildmaster.enums import BuildStatus
48 >>> alsa_build = alsa_spr.createBuild(48 >>> alsa_build = alsa_spr.createBuild(
49 ... hoary['i386'], PackagePublishingPocket.RELEASE,49 ... hoary['i386'], PackagePublishingPocket.RELEASE,
50 ... hoary.main_archive)50 ... hoary.main_archive)
5151
=== modified file 'lib/lp/soyuz/doc/build-notification.txt'
--- lib/lp/soyuz/doc/build-notification.txt 2010-08-23 16:51:11 +0000
+++ lib/lp/soyuz/doc/build-notification.txt 2010-08-30 02:12:47 +0000
@@ -419,7 +419,7 @@
419 >>> from lp.registry.interfaces.person import IPersonSet419 >>> from lp.registry.interfaces.person import IPersonSet
420 >>> cprov = getUtility(IPersonSet).getByName('cprov')420 >>> cprov = getUtility(IPersonSet).getByName('cprov')
421421
422 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus422 >>> from lp.buildmaster.enums import BuildStatus
423 >>> failed_candidate = cprov.archive.getBuildRecords(423 >>> failed_candidate = cprov.archive.getBuildRecords(
424 ... build_state=BuildStatus.FAILEDTOBUILD, name='cdrkit')[0]424 ... build_state=BuildStatus.FAILEDTOBUILD, name='cdrkit')[0]
425425
426426
=== modified file 'lib/lp/soyuz/doc/buildd-dispatching.txt'
--- lib/lp/soyuz/doc/buildd-dispatching.txt 2010-06-02 16:32:10 +0000
+++ lib/lp/soyuz/doc/buildd-dispatching.txt 2010-08-30 02:12:47 +0000
@@ -186,7 +186,7 @@
186186
187 >>> BuilddSlaveTestSetup().tearDown()187 >>> BuilddSlaveTestSetup().tearDown()
188188
189 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus189 >>> from lp.buildmaster.enums import BuildStatus
190 >>> build.status = BuildStatus.FAILEDTOBUILD190 >>> build.status = BuildStatus.FAILEDTOBUILD
191 >>> job.destroySelf()191 >>> job.destroySelf()
192 >>> flush_database_updates()192 >>> flush_database_updates()
193193
=== modified file 'lib/lp/soyuz/doc/buildd-slavescanner.txt'
--- lib/lp/soyuz/doc/buildd-slavescanner.txt 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/doc/buildd-slavescanner.txt 2010-08-30 02:12:47 +0000
@@ -429,7 +429,7 @@
429Now in order to emulate a successfully binary upload we will update429Now in order to emulate a successfully binary upload we will update
430the build record to FULLYBUILT, as the process-upload would do:430the build record to FULLYBUILT, as the process-upload would do:
431431
432 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus432 >>> from lp.buildmaster.enums import BuildStatus
433 >>> build.status = BuildStatus.FULLYBUILT433 >>> build.status = BuildStatus.FULLYBUILT
434434
435Now the updateBuild should recognize this build record as a435Now the updateBuild should recognize this build record as a
436436
=== modified file 'lib/lp/soyuz/doc/hasbuildrecords.txt'
--- lib/lp/soyuz/doc/hasbuildrecords.txt 2010-03-06 04:57:40 +0000
+++ lib/lp/soyuz/doc/hasbuildrecords.txt 2010-08-30 02:12:47 +0000
@@ -22,7 +22,7 @@
22The method has a number of filtering options, such as filtering by build22The method has a number of filtering options, such as filtering by build
23status,23status,
2424
25 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus25 >>> from lp.buildmaster.enums import BuildStatus
26 >>> hoary.getBuildRecords(build_state=BuildStatus.FULLYBUILT).count()26 >>> hoary.getBuildRecords(build_state=BuildStatus.FULLYBUILT).count()
27 227 2
2828
2929
=== modified file 'lib/lp/soyuz/doc/packageupload-lookups.txt'
--- lib/lp/soyuz/doc/packageupload-lookups.txt 2010-03-06 04:57:40 +0000
+++ lib/lp/soyuz/doc/packageupload-lookups.txt 2010-08-30 02:12:47 +0000
@@ -29,7 +29,7 @@
2929
30 # Audit the source publication and builds of a given archive30 # Audit the source publication and builds of a given archive
31 # and report missing uploads.31 # and report missing uploads.
32 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus32 >>> from lp.buildmaster.enums import BuildStatus
33 >>> def check_upload_lookups(archive):33 >>> def check_upload_lookups(archive):
34 ... sources_missing_upload = []34 ... sources_missing_upload = []
35 ... sources = list(archive.getPublishedSources())35 ... sources = list(archive.getPublishedSources())
3636
=== modified file 'lib/lp/soyuz/doc/publishing.txt'
--- lib/lp/soyuz/doc/publishing.txt 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/doc/publishing.txt 2010-08-30 02:12:47 +0000
@@ -139,7 +139,7 @@
139augments the IBuildSet.getStatusSummaryForBuilds() method to include the139augments the IBuildSet.getStatusSummaryForBuilds() method to include the
140'pending' state when builds are fully built but not yet published.140'pending' state when builds are fully built but not yet published.
141141
142 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus142 >>> from lp.buildmaster.enums import BuildStatus
143 >>> spph = test_publisher.getPubSource(143 >>> spph = test_publisher.getPubSource(
144 ... sourcename='abc', architecturehintlist='any')144 ... sourcename='abc', architecturehintlist='any')
145 >>> builds = spph.createMissingBuilds()145 >>> builds = spph.createMissingBuilds()
146146
=== modified file 'lib/lp/soyuz/doc/queuebuilder.txt'
--- lib/lp/soyuz/doc/queuebuilder.txt 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/doc/queuebuilder.txt 2010-08-30 02:12:47 +0000
@@ -232,7 +232,7 @@
232 >>> copied_pub = pub_failed.copyTo(232 >>> copied_pub = pub_failed.copyTo(
233 ... hoary, PackagePublishingPocket.RELEASE, warty.main_archive)233 ... hoary, PackagePublishingPocket.RELEASE, warty.main_archive)
234234
235 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus235 >>> from lp.buildmaster.enums import BuildStatus
236 >>> from lp.soyuz.interfaces.binarypackagebuild import (236 >>> from lp.soyuz.interfaces.binarypackagebuild import (
237 ... IBinaryPackageBuildSet)237 ... IBinaryPackageBuildSet)
238 >>> failed_build = pub_failed.sourcepackagerelease.createBuild(238 >>> failed_build = pub_failed.sourcepackagerelease.createBuild(
239239
=== modified file 'lib/lp/soyuz/doc/sourcepackagerelease-build-lookup.txt'
--- lib/lp/soyuz/doc/sourcepackagerelease-build-lookup.txt 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/doc/sourcepackagerelease-build-lookup.txt 2010-08-30 02:12:47 +0000
@@ -43,7 +43,7 @@
43 >>> hoary_evo_source = hoary.getSourcePackage('evolution')43 >>> hoary_evo_source = hoary.getSourcePackage('evolution')
44 >>> evo_release = hoary_evo_source['1.0'].sourcepackagerelease44 >>> evo_release = hoary_evo_source['1.0'].sourcepackagerelease
4545
46 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus46 >>> from lp.buildmaster.enums import BuildStatus
47 >>> evo_build_i386 = evo_release.createBuild(47 >>> evo_build_i386 = evo_release.createBuild(
48 ... hoary_i386, pocket_release, ubuntu.main_archive,48 ... hoary_i386, pocket_release, ubuntu.main_archive,
49 ... status=BuildStatus.FULLYBUILT)49 ... status=BuildStatus.FULLYBUILT)
5050
=== modified file 'lib/lp/soyuz/doc/soyuz-set-of-uploads.txt'
--- lib/lp/soyuz/doc/soyuz-set-of-uploads.txt 2010-08-26 15:28:34 +0000
+++ lib/lp/soyuz/doc/soyuz-set-of-uploads.txt 2010-08-30 02:12:47 +0000
@@ -608,7 +608,7 @@
608608
609Check there's a SourcePackageRelease with no build.609Check there's a SourcePackageRelease with no build.
610610
611 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus611 >>> from lp.buildmaster.enums import BuildStatus
612 >>> from lp.registry.model.sourcepackagename import SourcePackageName612 >>> from lp.registry.model.sourcepackagename import SourcePackageName
613 >>> from lp.registry.interfaces.pocket import PackagePublishingPocket613 >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
614 >>> from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild614 >>> from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
615615
=== modified file 'lib/lp/soyuz/interfaces/binarypackagebuild.py'
--- lib/lp/soyuz/interfaces/binarypackagebuild.py 2010-08-20 20:31:18 +0000
+++ lib/lp/soyuz/interfaces/binarypackagebuild.py 2010-08-30 02:12:47 +0000
@@ -38,7 +38,7 @@
38 )38 )
3939
40from canonical.launchpad import _40from canonical.launchpad import _
41from lp.buildmaster.interfaces.buildbase import BuildStatus41from lp.buildmaster.enums import BuildStatus
42from lp.buildmaster.interfaces.packagebuild import IPackageBuild42from lp.buildmaster.interfaces.packagebuild import IPackageBuild
43from lp.soyuz.interfaces.processor import IProcessor43from lp.soyuz.interfaces.processor import IProcessor
44from lp.soyuz.interfaces.publishing import ISourcePackagePublishingHistory44from lp.soyuz.interfaces.publishing import ISourcePackagePublishingHistory
4545
=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/model/archive.py 2010-08-30 02:12:47 +0000
@@ -75,7 +75,7 @@
75 re_isadeb,75 re_isadeb,
76 re_issource,76 re_issource,
77 )77 )
78from lp.buildmaster.interfaces.buildbase import BuildStatus78from lp.buildmaster.enums import BuildStatus
79from lp.buildmaster.interfaces.packagebuild import IPackageBuildSet79from lp.buildmaster.interfaces.packagebuild import IPackageBuildSet
80from lp.buildmaster.model.buildfarmjob import BuildFarmJob80from lp.buildmaster.model.buildfarmjob import BuildFarmJob
81from lp.buildmaster.model.packagebuild import PackageBuild81from lp.buildmaster.model.packagebuild import PackageBuild
8282
=== modified file 'lib/lp/soyuz/model/binarypackagebuild.py'
--- lib/lp/soyuz/model/binarypackagebuild.py 2010-08-25 11:01:59 +0000
+++ lib/lp/soyuz/model/binarypackagebuild.py 2010-08-30 02:12:47 +0000
@@ -69,8 +69,10 @@
69from canonical.launchpad.webapp.tales import DurationFormatterAPI69from canonical.launchpad.webapp.tales import DurationFormatterAPI
70from lp.app.errors import NotFoundError70from lp.app.errors import NotFoundError
71from lp.archivepublisher.utils import get_ppa_reference71from lp.archivepublisher.utils import get_ppa_reference
72from lp.buildmaster.interfaces.buildbase import BuildStatus72from lp.buildmaster.enums import (
73from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType73 BuildFarmJobType,
74 BuildStatus,
75 )
74from lp.buildmaster.interfaces.packagebuild import IPackageBuildSource76from lp.buildmaster.interfaces.packagebuild import IPackageBuildSource
75from lp.buildmaster.model.builder import Builder77from lp.buildmaster.model.builder import Builder
76from lp.buildmaster.model.buildfarmjob import BuildFarmJob78from lp.buildmaster.model.buildfarmjob import BuildFarmJob
7779
=== modified file 'lib/lp/soyuz/model/buildfarmbuildjob.py'
--- lib/lp/soyuz/model/buildfarmbuildjob.py 2010-08-20 20:31:18 +0000
+++ lib/lp/soyuz/model/buildfarmbuildjob.py 2010-08-30 02:12:47 +0000
@@ -10,7 +10,7 @@
10from zope.interface import implements10from zope.interface import implements
1111
12from canonical.database.constants import UTC_NOW12from canonical.database.constants import UTC_NOW
13from lp.buildmaster.interfaces.buildbase import BuildStatus13from lp.buildmaster.enums import BuildStatus
14from lp.buildmaster.model.buildfarmjob import BuildFarmJobOld14from lp.buildmaster.model.buildfarmjob import BuildFarmJobOld
15from lp.soyuz.interfaces.buildfarmbuildjob import IBuildFarmBuildJob15from lp.soyuz.interfaces.buildfarmbuildjob import IBuildFarmBuildJob
1616
1717
=== modified file 'lib/lp/soyuz/model/buildpackagejob.py'
--- lib/lp/soyuz/model/buildpackagejob.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/model/buildpackagejob.py 2010-08-30 02:12:47 +0000
@@ -19,7 +19,7 @@
19from zope.interface import implements19from zope.interface import implements
2020
21from canonical.database.sqlbase import sqlvalues21from canonical.database.sqlbase import sqlvalues
22from lp.buildmaster.interfaces.buildbase import BuildStatus22from lp.buildmaster.enums import BuildStatus
23from lp.buildmaster.model.buildfarmjob import BuildFarmJobOldDerived23from lp.buildmaster.model.buildfarmjob import BuildFarmJobOldDerived
24from lp.registry.interfaces.pocket import PackagePublishingPocket24from lp.registry.interfaces.pocket import PackagePublishingPocket
25from lp.registry.interfaces.sourcepackage import SourcePackageUrgency25from lp.registry.interfaces.sourcepackage import SourcePackageUrgency
2626
=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/model/publishing.py 2010-08-30 02:12:47 +0000
@@ -63,7 +63,7 @@
63 MAIN_STORE,63 MAIN_STORE,
64 )64 )
65from lp.app.errors import NotFoundError65from lp.app.errors import NotFoundError
66from lp.buildmaster.interfaces.buildbase import BuildStatus66from lp.buildmaster.enums import BuildStatus
67from lp.buildmaster.model.buildfarmjob import BuildFarmJob67from lp.buildmaster.model.buildfarmjob import BuildFarmJob
68from lp.buildmaster.model.packagebuild import PackageBuild68from lp.buildmaster.model.packagebuild import PackageBuild
69from lp.registry.interfaces.person import validate_public_person69from lp.registry.interfaces.person import validate_public_person
7070
=== modified file 'lib/lp/soyuz/model/sourcepackagerelease.py'
--- lib/lp/soyuz/model/sourcepackagerelease.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/model/sourcepackagerelease.py 2010-08-30 02:12:47 +0000
@@ -53,7 +53,7 @@
53from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities53from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
54from lp.app.errors import NotFoundError54from lp.app.errors import NotFoundError
55from lp.archiveuploader.utils import determine_source_file_type55from lp.archiveuploader.utils import determine_source_file_type
56from lp.buildmaster.interfaces.buildbase import BuildStatus56from lp.buildmaster.enums import BuildStatus
57from lp.registry.interfaces.person import validate_public_person57from lp.registry.interfaces.person import validate_public_person
58from lp.registry.interfaces.sourcepackage import (58from lp.registry.interfaces.sourcepackage import (
59 SourcePackageType,59 SourcePackageType,
6060
=== modified file 'lib/lp/soyuz/scripts/buildd.py'
--- lib/lp/soyuz/scripts/buildd.py 2010-08-20 20:31:18 +0000
+++ lib/lp/soyuz/scripts/buildd.py 2010-08-30 02:12:47 +0000
@@ -17,7 +17,7 @@
17from lp.app.errors import NotFoundError17from lp.app.errors import NotFoundError
18from lp.archivepublisher.debversion import Version18from lp.archivepublisher.debversion import Version
19from lp.archivepublisher.utils import process_in_batches19from lp.archivepublisher.utils import process_in_batches
20from lp.buildmaster.interfaces.buildbase import BuildStatus20from lp.buildmaster.enums import BuildStatus
21from lp.buildmaster.interfaces.builder import IBuilderSet21from lp.buildmaster.interfaces.builder import IBuilderSet
22from lp.registry.interfaces.distribution import IDistributionSet22from lp.registry.interfaces.distribution import IDistributionSet
23from lp.registry.interfaces.series import SeriesStatus23from lp.registry.interfaces.series import SeriesStatus
2424
=== modified file 'lib/lp/soyuz/scripts/gina/handlers.py'
--- lib/lp/soyuz/scripts/gina/handlers.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/scripts/gina/handlers.py 2010-08-30 02:12:47 +0000
@@ -38,7 +38,7 @@
38 determine_binary_file_type,38 determine_binary_file_type,
39 determine_source_file_type,39 determine_source_file_type,
40 )40 )
41from lp.buildmaster.interfaces.buildbase import BuildStatus41from lp.buildmaster.enums import BuildStatus
42from lp.registry.interfaces.person import (42from lp.registry.interfaces.person import (
43 IPersonSet,43 IPersonSet,
44 PersonCreationRationale,44 PersonCreationRationale,
4545
=== modified file 'lib/lp/soyuz/scripts/initialise_distroseries.py'
--- lib/lp/soyuz/scripts/initialise_distroseries.py 2010-08-25 11:01:59 +0000
+++ lib/lp/soyuz/scripts/initialise_distroseries.py 2010-08-30 02:12:47 +0000
@@ -18,7 +18,7 @@
18 MAIN_STORE,18 MAIN_STORE,
19 MASTER_FLAVOR,19 MASTER_FLAVOR,
20 )20 )
21from lp.buildmaster.interfaces.buildbase import BuildStatus21from lp.buildmaster.enums import BuildStatus
22from lp.registry.interfaces.pocket import PackagePublishingPocket22from lp.registry.interfaces.pocket import PackagePublishingPocket
23from lp.soyuz.adapters.packagelocation import PackageLocation23from lp.soyuz.adapters.packagelocation import PackageLocation
24from lp.soyuz.enums import (24from lp.soyuz.enums import (
2525
=== modified file 'lib/lp/soyuz/scripts/packagecopier.py'
--- lib/lp/soyuz/scripts/packagecopier.py 2010-08-24 13:56:22 +0000
+++ lib/lp/soyuz/scripts/packagecopier.py 2010-08-30 02:12:47 +0000
@@ -25,7 +25,7 @@
2525
26from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet26from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
27from canonical.librarian.utils import copy_and_close27from canonical.librarian.utils import copy_and_close
28from lp.buildmaster.interfaces.buildbase import BuildStatus28from lp.buildmaster.enums import BuildStatus
29from lp.soyuz.adapters.packagelocation import build_package_location29from lp.soyuz.adapters.packagelocation import build_package_location
30from lp.soyuz.enums import ArchivePurpose30from lp.soyuz.enums import ArchivePurpose
31from lp.soyuz.interfaces.archive import (31from lp.soyuz.interfaces.archive import (
3232
=== modified file 'lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py'
--- lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py 2010-08-20 20:31:18 +0000
+++ lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py 2010-08-30 02:12:47 +0000
@@ -25,7 +25,7 @@
25 LaunchpadLayer,25 LaunchpadLayer,
26 LaunchpadZopelessLayer,26 LaunchpadZopelessLayer,
27 )27 )
28from lp.buildmaster.interfaces.buildbase import BuildStatus28from lp.buildmaster.enums import BuildStatus
29from lp.buildmaster.model.buildfarmjob import BuildFarmJob29from lp.buildmaster.model.buildfarmjob import BuildFarmJob
30from lp.buildmaster.model.packagebuild import PackageBuild30from lp.buildmaster.model.packagebuild import PackageBuild
31from lp.registry.interfaces.distribution import IDistributionSet31from lp.registry.interfaces.distribution import IDistributionSet
3232
=== modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
--- lib/lp/soyuz/scripts/tests/test_copypackage.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/scripts/tests/test_copypackage.py 2010-08-30 02:12:47 +0000
@@ -28,7 +28,7 @@
28 IBugSet,28 IBugSet,
29 )29 )
30from lp.bugs.interfaces.bugtask import BugTaskStatus30from lp.bugs.interfaces.bugtask import BugTaskStatus
31from lp.buildmaster.interfaces.buildbase import BuildStatus31from lp.buildmaster.enums import BuildStatus
32from lp.registry.interfaces.distribution import IDistributionSet32from lp.registry.interfaces.distribution import IDistributionSet
33from lp.registry.interfaces.person import IPersonSet33from lp.registry.interfaces.person import IPersonSet
34from lp.registry.interfaces.pocket import PackagePublishingPocket34from lp.registry.interfaces.pocket import PackagePublishingPocket
3535
=== modified file 'lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py'
--- lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py 2010-08-27 06:52:42 +0000
+++ lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py 2010-08-30 02:12:47 +0000
@@ -21,7 +21,7 @@
21 MASTER_FLAVOR,21 MASTER_FLAVOR,
22 )22 )
23from canonical.testing.layers import LaunchpadZopelessLayer23from canonical.testing.layers import LaunchpadZopelessLayer
24from lp.buildmaster.interfaces.buildbase import BuildStatus24from lp.buildmaster.enums import BuildStatus
25from lp.registry.interfaces.pocket import PackagePublishingPocket25from lp.registry.interfaces.pocket import PackagePublishingPocket
26from lp.soyuz.interfaces.archivepermission import IArchivePermissionSet26from lp.soyuz.interfaces.archivepermission import IArchivePermissionSet
27from lp.soyuz.interfaces.packageset import IPackagesetSet27from lp.soyuz.interfaces.packageset import IPackagesetSet
2828
=== modified file 'lib/lp/soyuz/scripts/tests/test_populatearchive.py'
--- lib/lp/soyuz/scripts/tests/test_populatearchive.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/scripts/tests/test_populatearchive.py 2010-08-30 02:12:47 +0000
@@ -19,7 +19,7 @@
19 )19 )
20from canonical.testing import LaunchpadZopelessLayer20from canonical.testing import LaunchpadZopelessLayer
21from canonical.testing.layers import DatabaseLayer21from canonical.testing.layers import DatabaseLayer
22from lp.buildmaster.interfaces.buildbase import BuildStatus22from lp.buildmaster.enums import BuildStatus
23from lp.registry.interfaces.distribution import IDistributionSet23from lp.registry.interfaces.distribution import IDistributionSet
24from lp.registry.interfaces.person import IPersonSet24from lp.registry.interfaces.person import IPersonSet
25from lp.services.job.interfaces.job import JobStatus25from lp.services.job.interfaces.job import JobStatus
2626
=== modified file 'lib/lp/soyuz/stories/ppa/xx-copy-packages.txt'
--- lib/lp/soyuz/stories/ppa/xx-copy-packages.txt 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/stories/ppa/xx-copy-packages.txt 2010-08-30 02:12:47 +0000
@@ -972,7 +972,7 @@
972 ... archive=jblack_friends.archive,972 ... archive=jblack_friends.archive,
973 ... status=PackagePublishingStatus.PUBLISHED)973 ... status=PackagePublishingStatus.PUBLISHED)
974 >>> [build] = jblack_friends_foo_src.createMissingBuilds()974 >>> [build] = jblack_friends_foo_src.createMissingBuilds()
975 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus975 >>> from lp.buildmaster.enums import BuildStatus
976 >>> build.status = BuildStatus.FAILEDTOBUILD976 >>> build.status = BuildStatus.FAILEDTOBUILD
977977
978 >>> flush_database_updates()978 >>> flush_database_updates()
979979
=== modified file 'lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt'
--- lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt 2010-05-26 08:53:13 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt 2010-08-30 02:12:47 +0000
@@ -410,7 +410,7 @@
410If the ppa has some current activity (building or waiting builds) then this410If the ppa has some current activity (building or waiting builds) then this
411is also included in the statistics portlet.411is also included in the statistics portlet.
412412
413 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus413 >>> from lp.buildmaster.enums import BuildStatus
414 >>> from lp.registry.interfaces.person import IPersonSet414 >>> from lp.registry.interfaces.person import IPersonSet
415 >>> from lp.soyuz.interfaces.binarypackagebuild import (415 >>> from lp.soyuz.interfaces.binarypackagebuild import (
416 ... IBinaryPackageBuildSet)416 ... IBinaryPackageBuildSet)
417417
=== modified file 'lib/lp/soyuz/stories/soyuz/xx-build-record.txt'
--- lib/lp/soyuz/stories/soyuz/xx-build-record.txt 2010-06-08 15:13:29 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-build-record.txt 2010-08-30 02:12:47 +0000
@@ -153,7 +153,7 @@
153 # build with an known buildlog 'tail'.153 # build with an known buildlog 'tail'.
154 >>> login('foo.bar@canonical.com')154 >>> login('foo.bar@canonical.com')
155 >>> from canonical.database.constants import UTC_NOW155 >>> from canonical.database.constants import UTC_NOW
156 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus156 >>> from lp.buildmaster.enums import BuildStatus
157 >>> in_progress_build.buildqueue_record.reset()157 >>> in_progress_build.buildqueue_record.reset()
158 >>> build.buildqueue_record.markAsBuilding(bob_builder)158 >>> build.buildqueue_record.markAsBuilding(bob_builder)
159 >>> build.buildqueue_record.logtail = 'one line\nanother line'159 >>> build.buildqueue_record.logtail = 'one line\nanother line'
160160
=== modified file 'lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt'
--- lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt 2010-06-25 23:12:45 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt 2010-08-30 02:12:47 +0000
@@ -60,7 +60,7 @@
60 >>> import datetime60 >>> import datetime
61 >>> from zope.component import getUtility61 >>> from zope.component import getUtility
62 >>> from zope.security.proxy import removeSecurityProxy62 >>> from zope.security.proxy import removeSecurityProxy
63 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus63 >>> from lp.buildmaster.enums import BuildStatus
64 >>> from lp.registry.interfaces.person import IPersonSet64 >>> from lp.registry.interfaces.person import IPersonSet
65 >>> login('foo.bar@canonical.com')65 >>> login('foo.bar@canonical.com')
66 >>> cprov = getUtility(IPersonSet).getByName('cprov')66 >>> cprov = getUtility(IPersonSet).getByName('cprov')
6767
=== modified file 'lib/lp/soyuz/stories/webservice/xx-builds.txt'
--- lib/lp/soyuz/stories/webservice/xx-builds.txt 2010-06-14 18:14:28 +0000
+++ lib/lp/soyuz/stories/webservice/xx-builds.txt 2010-08-30 02:12:47 +0000
@@ -200,7 +200,7 @@
200alter the buildstate to one that cannot be retried:200alter the buildstate to one that cannot be retried:
201201
202 >>> login('foo.bar@canonical.com')202 >>> login('foo.bar@canonical.com')
203 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus203 >>> from lp.buildmaster.enums import BuildStatus
204 >>> build.status = BuildStatus.FAILEDTOUPLOAD204 >>> build.status = BuildStatus.FAILEDTOUPLOAD
205 >>> logout()205 >>> logout()
206206
207207
=== modified file 'lib/lp/soyuz/tests/test_archive.py'
--- lib/lp/soyuz/tests/test_archive.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/tests/test_archive.py 2010-08-30 02:12:47 +0000
@@ -23,7 +23,7 @@
23 DatabaseFunctionalLayer,23 DatabaseFunctionalLayer,
24 LaunchpadZopelessLayer,24 LaunchpadZopelessLayer,
25 )25 )
26from lp.buildmaster.interfaces.buildbase import BuildStatus26from lp.buildmaster.enums import BuildStatus
27from lp.registry.interfaces.pocket import PackagePublishingPocket27from lp.registry.interfaces.pocket import PackagePublishingPocket
28from lp.registry.interfaces.series import SeriesStatus28from lp.registry.interfaces.series import SeriesStatus
29from lp.services.job.interfaces.job import JobStatus29from lp.services.job.interfaces.job import JobStatus
3030
=== modified file 'lib/lp/soyuz/tests/test_binarypackagebuild.py'
--- lib/lp/soyuz/tests/test_binarypackagebuild.py 2010-08-25 11:01:59 +0000
+++ lib/lp/soyuz/tests/test_binarypackagebuild.py 2010-08-30 02:12:47 +0000
@@ -14,7 +14,7 @@
14from zope.security.proxy import removeSecurityProxy14from zope.security.proxy import removeSecurityProxy
1515
16from canonical.testing import LaunchpadZopelessLayer16from canonical.testing import LaunchpadZopelessLayer
17from lp.buildmaster.interfaces.buildbase import BuildStatus17from lp.buildmaster.enums import BuildStatus
18from lp.buildmaster.interfaces.builder import IBuilderSet18from lp.buildmaster.interfaces.builder import IBuilderSet
19from lp.buildmaster.interfaces.buildqueue import IBuildQueue19from lp.buildmaster.interfaces.buildqueue import IBuildQueue
20from lp.buildmaster.interfaces.packagebuild import IPackageBuild20from lp.buildmaster.interfaces.packagebuild import IPackageBuild
2121
=== modified file 'lib/lp/soyuz/tests/test_buildpackagejob.py'
--- lib/lp/soyuz/tests/test_buildpackagejob.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/tests/test_buildpackagejob.py 2010-08-30 02:12:47 +0000
@@ -17,7 +17,7 @@
17 DatabaseFunctionalLayer,17 DatabaseFunctionalLayer,
18 LaunchpadZopelessLayer,18 LaunchpadZopelessLayer,
19 )19 )
20from lp.buildmaster.interfaces.buildbase import BuildStatus20from lp.buildmaster.enums import BuildStatus
21from lp.buildmaster.interfaces.builder import IBuilderSet21from lp.buildmaster.interfaces.builder import IBuilderSet
22from lp.soyuz.enums import ArchivePurpose22from lp.soyuz.enums import ArchivePurpose
23from lp.soyuz.interfaces.buildfarmbuildjob import IBuildFarmBuildJob23from lp.soyuz.interfaces.buildfarmbuildjob import IBuildFarmBuildJob
2424
=== modified file 'lib/lp/soyuz/tests/test_copyarchivejob.py'
--- lib/lp/soyuz/tests/test_copyarchivejob.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/tests/test_copyarchivejob.py 2010-08-30 02:12:47 +0000
@@ -9,7 +9,7 @@
9from zope.security.proxy import removeSecurityProxy9from zope.security.proxy import removeSecurityProxy
1010
11from canonical.testing import DatabaseFunctionalLayer11from canonical.testing import DatabaseFunctionalLayer
12from lp.buildmaster.interfaces.buildbase import BuildStatus12from lp.buildmaster.enums import BuildStatus
13from lp.registry.interfaces.pocket import PackagePublishingPocket13from lp.registry.interfaces.pocket import PackagePublishingPocket
14from lp.soyuz.adapters.packagelocation import PackageLocation14from lp.soyuz.adapters.packagelocation import PackageLocation
15from lp.soyuz.enums import ArchivePurpose15from lp.soyuz.enums import ArchivePurpose
1616
=== modified file 'lib/lp/soyuz/tests/test_hasbuildrecords.py'
--- lib/lp/soyuz/tests/test_hasbuildrecords.py 2010-08-20 20:31:18 +0000
+++ lib/lp/soyuz/tests/test_hasbuildrecords.py 2010-08-30 02:12:47 +0000
@@ -7,9 +7,9 @@
7from zope.security.proxy import removeSecurityProxy7from zope.security.proxy import removeSecurityProxy
88
9from canonical.testing import LaunchpadZopelessLayer9from canonical.testing import LaunchpadZopelessLayer
10from lp.buildmaster.enums import BuildFarmJobType
10from lp.buildmaster.interfaces.builder import IBuilderSet11from lp.buildmaster.interfaces.builder import IBuilderSet
11from lp.buildmaster.interfaces.buildfarmjob import (12from lp.buildmaster.interfaces.buildfarmjob import (
12 BuildFarmJobType,
13 IBuildFarmJob,13 IBuildFarmJob,
14 )14 )
15from lp.buildmaster.interfaces.packagebuild import IPackageBuildSource15from lp.buildmaster.interfaces.packagebuild import IPackageBuildSource
@@ -144,7 +144,7 @@
144 # can only test this by creating a lone IBuildFarmJob of a144 # can only test this by creating a lone IBuildFarmJob of a
145 # different type.145 # different type.
146 from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJobSource146 from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJobSource
147 from lp.buildmaster.interfaces.buildbase import BuildStatus147 from lp.buildmaster.enums import BuildStatus
148 build_farm_job = getUtility(IBuildFarmJobSource).new(148 build_farm_job = getUtility(IBuildFarmJobSource).new(
149 job_type=BuildFarmJobType.RECIPEBRANCHBUILD, virtualized=True,149 job_type=BuildFarmJobType.RECIPEBRANCHBUILD, virtualized=True,
150 status=BuildStatus.BUILDING)150 status=BuildStatus.BUILDING)
151151
=== modified file 'lib/lp/soyuz/tests/test_packagecloner.py'
--- lib/lp/soyuz/tests/test_packagecloner.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/tests/test_packagecloner.py 2010-08-30 02:12:47 +0000
@@ -7,7 +7,7 @@
7from zope.security.proxy import removeSecurityProxy7from zope.security.proxy import removeSecurityProxy
88
9from canonical.testing import LaunchpadZopelessLayer9from canonical.testing import LaunchpadZopelessLayer
10from lp.buildmaster.interfaces.buildbase import BuildStatus10from lp.buildmaster.enums import BuildStatus
11from lp.registry.interfaces.pocket import PackagePublishingPocket11from lp.registry.interfaces.pocket import PackagePublishingPocket
12from lp.soyuz.adapters.packagelocation import PackageLocation12from lp.soyuz.adapters.packagelocation import PackageLocation
13from lp.soyuz.enums import (13from lp.soyuz.enums import (
1414
=== modified file 'lib/lp/soyuz/tests/test_packageupload.py'
--- lib/lp/soyuz/tests/test_packageupload.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/tests/test_packageupload.py 2010-08-30 02:12:47 +0000
@@ -13,7 +13,7 @@
13from canonical.launchpad.scripts import BufferLogger13from canonical.launchpad.scripts import BufferLogger
14from canonical.testing import LaunchpadZopelessLayer14from canonical.testing import LaunchpadZopelessLayer
15from lp.archiveuploader.tests import datadir15from lp.archiveuploader.tests import datadir
16from lp.buildmaster.interfaces.buildbase import BuildStatus16from lp.buildmaster.enums import BuildStatus
17from lp.registry.interfaces.distribution import IDistributionSet17from lp.registry.interfaces.distribution import IDistributionSet
18from lp.registry.interfaces.pocket import PackagePublishingPocket18from lp.registry.interfaces.pocket import PackagePublishingPocket
19from lp.registry.interfaces.series import SeriesStatus19from lp.registry.interfaces.series import SeriesStatus
2020
=== modified file 'lib/lp/soyuz/tests/test_publishing.py'
--- lib/lp/soyuz/tests/test_publishing.py 2010-08-24 12:25:48 +0000
+++ lib/lp/soyuz/tests/test_publishing.py 2010-08-30 02:12:47 +0000
@@ -28,7 +28,7 @@
28from lp.app.errors import NotFoundError28from lp.app.errors import NotFoundError
29from lp.archivepublisher.config import Config29from lp.archivepublisher.config import Config
30from lp.archivepublisher.diskpool import DiskPool30from lp.archivepublisher.diskpool import DiskPool
31from lp.buildmaster.interfaces.buildbase import BuildStatus31from lp.buildmaster.enums import BuildStatus
32from lp.registry.interfaces.distribution import IDistributionSet32from lp.registry.interfaces.distribution import IDistributionSet
33from lp.registry.interfaces.distroseries import IDistroSeriesSet33from lp.registry.interfaces.distroseries import IDistroSeriesSet
34from lp.registry.interfaces.person import IPersonSet34from lp.registry.interfaces.person import IPersonSet
3535
=== modified file 'lib/lp/soyuz/tests/test_publishing_models.py'
--- lib/lp/soyuz/tests/test_publishing_models.py 2010-08-20 20:31:18 +0000
+++ lib/lp/soyuz/tests/test_publishing_models.py 2010-08-30 02:12:47 +0000
@@ -8,7 +8,7 @@
88
9from canonical.database.constants import UTC_NOW9from canonical.database.constants import UTC_NOW
10from canonical.testing import LaunchpadZopelessLayer10from canonical.testing import LaunchpadZopelessLayer
11from lp.buildmaster.interfaces.buildbase import BuildStatus11from lp.buildmaster.enums import BuildStatus
12from lp.soyuz.interfaces.publishing import (12from lp.soyuz.interfaces.publishing import (
13 IPublishingSet,13 IPublishingSet,
14 PackagePublishingStatus,14 PackagePublishingStatus,
1515
=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py 2010-08-27 04:24:55 +0000
+++ lib/lp/testing/factory.py 2010-08-30 02:12:47 +0000
@@ -110,9 +110,11 @@
110 IBugTrackerSet,110 IBugTrackerSet,
111 )111 )
112from lp.bugs.interfaces.bugwatch import IBugWatchSet112from lp.bugs.interfaces.bugwatch import IBugWatchSet
113from lp.buildmaster.interfaces.buildbase import BuildStatus113from lp.buildmaster.enums import (
114 BuildFarmJobType,
115 BuildStatus,
116 )
114from lp.buildmaster.interfaces.builder import IBuilderSet117from lp.buildmaster.interfaces.builder import IBuilderSet
115from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
116from lp.buildmaster.model.buildqueue import BuildQueue118from lp.buildmaster.model.buildqueue import BuildQueue
117from lp.code.enums import (119from lp.code.enums import (
118 BranchMergeProposalStatus,120 BranchMergeProposalStatus,
119121
=== modified file 'lib/lp/testing/tests/test_factory.py'
--- lib/lp/testing/tests/test_factory.py 2010-08-24 15:29:01 +0000
+++ lib/lp/testing/tests/test_factory.py 2010-08-30 02:12:47 +0000
@@ -17,7 +17,7 @@
17 DatabaseFunctionalLayer,17 DatabaseFunctionalLayer,
18 LaunchpadZopelessLayer,18 LaunchpadZopelessLayer,
19 )19 )
20from lp.buildmaster.interfaces.buildbase import BuildStatus20from lp.buildmaster.enums import BuildStatus
21from lp.code.enums import (21from lp.code.enums import (
22 BranchType,22 BranchType,
23 CodeImportReviewStatus,23 CodeImportReviewStatus,
2424
=== modified file 'lib/lp/translations/model/translationtemplatesbuildjob.py'
--- lib/lp/translations/model/translationtemplatesbuildjob.py 2010-08-25 09:27:12 +0000
+++ lib/lp/translations/model/translationtemplatesbuildjob.py 2010-08-30 02:12:47 +0000
@@ -23,8 +23,8 @@
23 IMasterStore,23 IMasterStore,
24 IStore,24 IStore,
25 )25 )
26from lp.buildmaster.enums import BuildFarmJobType
26from lp.buildmaster.interfaces.buildfarmbranchjob import IBuildFarmBranchJob27from lp.buildmaster.interfaces.buildfarmbranchjob import IBuildFarmBranchJob
27from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
28from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet28from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
29from lp.buildmaster.model.buildfarmjob import (29from lp.buildmaster.model.buildfarmjob import (
30 BuildFarmJobOld,30 BuildFarmJobOld,
3131
=== modified file 'lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py'
--- lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py 2010-08-20 20:31:18 +0000
+++ lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py 2010-08-30 02:12:47 +0000
@@ -16,7 +16,7 @@
16from canonical.launchpad.interfaces import ILaunchpadCelebrities16from canonical.launchpad.interfaces import ILaunchpadCelebrities
17from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet17from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
18from canonical.testing import LaunchpadZopelessLayer18from canonical.testing import LaunchpadZopelessLayer
19from lp.buildmaster.interfaces.buildbase import BuildStatus19from lp.buildmaster.enums import BuildStatus
20from lp.buildmaster.interfaces.buildfarmjobbehavior import (20from lp.buildmaster.interfaces.buildfarmjobbehavior import (
21 IBuildFarmJobBehavior,21 IBuildFarmJobBehavior,
22 )22 )
2323
=== modified file 'scripts/ftpmaster-tools/buildd-mass-retry.py'
--- scripts/ftpmaster-tools/buildd-mass-retry.py 2010-08-02 23:29:05 +0000
+++ scripts/ftpmaster-tools/buildd-mass-retry.py 2010-08-30 02:12:47 +0000
@@ -26,7 +26,7 @@
26from canonical.launchpad.scripts import (26from canonical.launchpad.scripts import (
27 execute_zcml_for_scripts, logger_options, logger)27 execute_zcml_for_scripts, logger_options, logger)
28from canonical.lp import initZopeless28from canonical.lp import initZopeless
29from lp.buildmaster.interfaces.buildbase import BuildStatus29from lp.buildmaster.enums import BuildStatus
30from lp.registry.interfaces.distribution import IDistributionSet30from lp.registry.interfaces.distribution import IDistributionSet
31from lp.registry.interfaces.pocket import PackagePublishingPocket31from lp.registry.interfaces.pocket import PackagePublishingPocket
3232