Launchpad itself

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

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

Commit message

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

Description of the change

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

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

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/canonical/launchpad/configure.zcml'
--- lib/canonical/launchpad/configure.zcml 2010-02-24 23:18:40 +0000
+++ lib/canonical/launchpad/configure.zcml 2010-03-08 21:22:31 +0000
@@ -22,6 +22,7 @@
2222
23 <include package="lp.app" />23 <include package="lp.app" />
24 <include package="lp.bugs" />24 <include package="lp.bugs" />
25 <include package="lp.buildmaster" />
25 <include package="lp.registry" />26 <include package="lp.registry" />
26 <include package="lp.answers" />27 <include package="lp.answers" />
27 <include package="lp.coop.answersbugs" />28 <include package="lp.coop.answersbugs" />
2829
=== modified file 'lib/canonical/launchpad/database/__init__.py'
--- lib/canonical/launchpad/database/__init__.py 2010-02-16 20:36:48 +0000
+++ lib/canonical/launchpad/database/__init__.py 2010-03-08 21:22:31 +0000
@@ -22,7 +22,6 @@
22from lp.soyuz.model.processor import *22from lp.soyuz.model.processor import *
23from lp.soyuz.model.build import *23from lp.soyuz.model.build import *
24from lp.buildmaster.model.builder import *24from lp.buildmaster.model.builder import *
25from lp.soyuz.model.buildqueue import *
26from lp.soyuz.model.publishing import *25from lp.soyuz.model.publishing import *
27from lp.soyuz.model.files import *26from lp.soyuz.model.files import *
28from lp.soyuz.model.queue import *27from lp.soyuz.model.queue import *
2928
=== modified file 'lib/canonical/launchpad/interfaces/__init__.py'
--- lib/canonical/launchpad/interfaces/__init__.py 2010-02-17 11:19:42 +0000
+++ lib/canonical/launchpad/interfaces/__init__.py 2010-03-08 21:22:31 +0000
@@ -45,7 +45,6 @@
45from lp.soyuz.interfaces.build import *45from lp.soyuz.interfaces.build import *
46from lp.buildmaster.interfaces.builder import *46from lp.buildmaster.interfaces.builder import *
47from lp.soyuz.interfaces.buildrecords import *47from lp.soyuz.interfaces.buildrecords import *
48from lp.soyuz.interfaces.buildqueue import *
49from lp.registry.interfaces.codeofconduct import *48from lp.registry.interfaces.codeofconduct import *
50from lp.registry.interfaces.commercialsubscription import *49from lp.registry.interfaces.commercialsubscription import *
51from lp.soyuz.interfaces.component import *50from lp.soyuz.interfaces.component import *
5251
=== added file 'lib/lp/buildmaster/configure.zcml'
--- lib/lp/buildmaster/configure.zcml 1970-01-01 00:00:00 +0000
+++ lib/lp/buildmaster/configure.zcml 2010-03-08 21:22:31 +0000
@@ -0,0 +1,67 @@
1<!-- Copyright 2010 Canonical Ltd. This software is licensed under the
2 GNU Affero General Public License version 3 (see the file LICENSE).
3-->
4
5<configure
6 xmlns="http://namespaces.zope.org/zope"
7 xmlns:browser="http://namespaces.zope.org/browser"
8 xmlns:i18n="http://namespaces.zope.org/i18n"
9 xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc"
10 i18n_domain="launchpad">
11
12
13 <!-- Builder -->
14 <class
15 class="lp.buildmaster.model.builder.Builder">
16 <allow
17 interface="lp.buildmaster.interfaces.builder.IBuilder"/>
18 <allow
19 interface="lp.soyuz.interfaces.buildrecords.IHasBuildRecords"/>
20 <require
21 permission="launchpad.Edit"
22 set_schema="lp.buildmaster.interfaces.builder.IBuilder"/>
23 </class>
24
25
26 <!-- BuilderSet -->
27 <securedutility
28 class="lp.buildmaster.model.builder.BuilderSet"
29 provides="lp.buildmaster.interfaces.builder.IBuilderSet">
30 <allow
31 interface="lp.buildmaster.interfaces.builder.IBuilderSet"/>
32 </securedutility>
33 <adapter
34 provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
35 for="lp.buildmaster.interfaces.builder.IBuilder"
36 factory="canonical.launchpad.webapp.breadcrumb.TitleBreadcrumb"
37 permission="zope.Public"/>
38 <adapter
39 provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
40 for="lp.buildmaster.interfaces.builder.IBuilderSet"
41 factory="lp.soyuz.browser.builder.BuilderSetBreadcrumb"
42 permission="zope.Public"/>
43
44
45 <!-- BuildQueue -->
46 <class
47 class="lp.buildmaster.model.buildqueue.BuildQueue">
48 <allow
49 interface="lp.buildmaster.interfaces.buildqueue.IBuildQueue"/>
50
51 <!-- XXX cprov 2005-10-20 bug=3580:
52 We need a autobuild celebrity. -->
53 <!-- Grant permissions to write on BuildQueue and Build. -->
54 <require
55 permission="zope.Public"
56 set_attributes="lastscore builder logtail date_started"/>
57 </class>
58
59
60 <!-- BuildQueueSet -->
61 <securedutility
62 class="lp.buildmaster.model.buildqueue.BuildQueueSet"
63 provides="lp.buildmaster.interfaces.buildqueue.IBuildQueueSet">
64 <allow
65 interface="lp.buildmaster.interfaces.buildqueue.IBuildQueueSet"/>
66 </securedutility>
67</configure>
068
=== renamed file 'lib/lp/soyuz/doc/buildqueue.txt' => 'lib/lp/buildmaster/doc/buildqueue.txt'
--- lib/lp/soyuz/doc/buildqueue.txt 2010-01-20 01:23:38 +0000
+++ lib/lp/buildmaster/doc/buildqueue.txt 2010-03-08 21:22:31 +0000
@@ -13,8 +13,8 @@
13collected) the BuildQueue record representing it is removed.13collected) the BuildQueue record representing it is removed.
1414
15 >>> from canonical.launchpad.webapp.testing import verifyObject15 >>> from canonical.launchpad.webapp.testing import verifyObject
16 >>> from canonical.launchpad.interfaces import IBuildQueue16 >>> from lp.buildmaster.interfaces.buildqueue import (
17 >>> from canonical.launchpad.interfaces import IBuildQueueSet17 ... IBuildQueue, IBuildQueueSet)
1818
19Get an instance of Builder from the current sampledata using the19Get an instance of Builder from the current sampledata using the
20IBuildQueueSet zope utility. The zope utility itself will be20IBuildQueueSet zope utility. The zope utility itself will be
2121
=== modified file 'lib/lp/buildmaster/interfaces/buildbase.py'
--- lib/lp/buildmaster/interfaces/buildbase.py 2010-03-08 11:10:06 +0000
+++ lib/lp/buildmaster/interfaces/buildbase.py 2010-03-08 21:22:31 +0000
@@ -16,10 +16,10 @@
16from lazr.restful.fields import Reference16from lazr.restful.fields import Reference
1717
18from lp.buildmaster.interfaces.builder import IBuilder18from lp.buildmaster.interfaces.builder import IBuilder
19from lp.buildmaster.interfaces.buildqueue import IBuildQueue
19from lp.registry.interfaces.distribution import IDistribution20from lp.registry.interfaces.distribution import IDistribution
20from lp.registry.interfaces.pocket import PackagePublishingPocket21from lp.registry.interfaces.pocket import PackagePublishingPocket
21from lp.soyuz.interfaces.archive import IArchive22from lp.soyuz.interfaces.archive import IArchive
22from lp.soyuz.interfaces.buildqueue import IBuildQueue
23from canonical.launchpad.interfaces.librarian import ILibraryFileAlias23from canonical.launchpad.interfaces.librarian import ILibraryFileAlias
24from canonical.launchpad import _24from canonical.launchpad import _
2525
2626
=== renamed file 'lib/lp/soyuz/interfaces/buildqueue.py' => 'lib/lp/buildmaster/interfaces/buildqueue.py'
=== modified file 'lib/lp/buildmaster/master.py'
--- lib/lp/buildmaster/master.py 2010-03-04 16:12:33 +0000
+++ lib/lp/buildmaster/master.py 2010-03-08 21:22:31 +0000
@@ -18,17 +18,15 @@
1818
19from zope.component import getUtility19from zope.component import getUtility
2020
21from canonical.buildd.utils import notes
22from canonical.config import config
21from canonical.librarian.interfaces import ILibrarianClient23from canonical.librarian.interfaces import ILibrarianClient
22
23from lp.soyuz.interfaces.archive import ArchivePurpose
24from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
25from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
26
27from lp.archivepublisher.utils import process_in_batches24from lp.archivepublisher.utils import process_in_batches
28from canonical.buildd.utils import notes25from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
29from lp.buildmaster.pas import BuildDaemonPackagesArchSpecific26from lp.buildmaster.pas import BuildDaemonPackagesArchSpecific
30from lp.buildmaster.buildergroup import BuilderGroup27from lp.buildmaster.buildergroup import BuilderGroup
31from canonical.config import config28from lp.soyuz.interfaces.archive import ArchivePurpose
29from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
3230
3331
34def determineArchitecturesToBuild(pubrec, legal_archseries,32def determineArchitecturesToBuild(pubrec, legal_archseries,
@@ -280,7 +278,6 @@
280 "scanActiveBuilders() found %d active build(s) to check"278 "scanActiveBuilders() found %d active build(s) to check"
281 % queueItems.count())279 % queueItems.count())
282280
283 build_set = getUtility(IBuildSet)
284 for job in queueItems:281 for job in queueItems:
285 job.builder.updateBuild(job)282 job.builder.updateBuild(job)
286 self.commit()283 self.commit()
287284
=== modified file 'lib/lp/buildmaster/model/buildbase.py'
--- lib/lp/buildmaster/model/buildbase.py 2010-03-08 11:10:06 +0000
+++ lib/lp/buildmaster/model/buildbase.py 2010-03-08 21:22:31 +0000
@@ -29,10 +29,10 @@
29from canonical.launchpad.helpers import filenameToContentType29from canonical.launchpad.helpers import filenameToContentType
30from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet30from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
31from canonical.librarian.utils import copy_and_close31from canonical.librarian.utils import copy_and_close
32from lp.buildmaster.model.buildqueue import BuildQueue
32from lp.buildmaster.interfaces.buildbase import BUILDD_MANAGER_LOG_NAME33from lp.buildmaster.interfaces.buildbase import BUILDD_MANAGER_LOG_NAME
33from lp.registry.interfaces.pocket import pocketsuffix34from lp.registry.interfaces.pocket import pocketsuffix
34from lp.soyuz.interfaces.build import BuildStatus35from lp.soyuz.interfaces.build import BuildStatus
35from lp.soyuz.model.buildqueue import BuildQueue
3636
3737
38UPLOAD_LOG_FILENAME = 'uploader.log'38UPLOAD_LOG_FILENAME = 'uploader.log'
3939
=== modified file 'lib/lp/buildmaster/model/builder.py'
--- lib/lp/buildmaster/model/builder.py 2010-03-04 16:12:33 +0000
+++ lib/lp/buildmaster/model/builder.py 2010-03-08 21:22:31 +0000
@@ -20,46 +20,42 @@
20import urllib220import urllib2
21import xmlrpclib21import xmlrpclib
2222
23from zope.interface import implements
24from zope.component import getUtility
25
26from sqlobject import (23from sqlobject import (
27 StringCol, ForeignKey, BoolCol, IntCol, SQLObjectNotFound)24 BoolCol, ForeignKey, IntCol, SQLObjectNotFound, StringCol)
28
29from storm.store import Store25from storm.store import Store
26from zope.component import getUtility
27from zope.interface import implements
3028
31from canonical.cachedproperty import cachedproperty29from canonical.cachedproperty import cachedproperty
32from canonical.config import config30from canonical.config import config
33from canonical.buildd.slave import BuilderStatus31from canonical.buildd.slave import BuilderStatus
32from canonical.launchpad.helpers import filenameToContentType
33from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
34from canonical.launchpad.webapp import urlappend
35from canonical.launchpad.webapp.interfaces import NotFoundError
36from canonical.launchpad.webapp.interfaces import (
37 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
38from canonical.lazr.utils import safe_hasattr
39from canonical.librarian.utils import copy_and_close
40from lp.buildmaster.interfaces.builder import (
41 BuildDaemonError, BuildSlaveFailure, CannotBuild, CannotFetchFile,
42 CannotResumeHost, IBuilder, IBuilderSet, ProtocolVersionMismatch)
34from lp.buildmaster.interfaces.buildfarmjobbehavior import (43from lp.buildmaster.interfaces.buildfarmjobbehavior import (
35 BuildBehaviorMismatch)44 BuildBehaviorMismatch)
45from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
36from lp.buildmaster.master import BuilddMaster46from lp.buildmaster.master import BuilddMaster
37from lp.buildmaster.model.buildfarmjobbehavior import IdleBuildBehavior47from lp.buildmaster.model.buildfarmjobbehavior import IdleBuildBehavior
48from lp.buildmaster.model.buildqueue import BuildQueue, specific_job_classes
38from canonical.database.sqlbase import SQLBase, sqlvalues49from canonical.database.sqlbase import SQLBase, sqlvalues
39
40# XXX Michael Nelson 2010-01-13 bug=491330,506617
41# These dependencies on soyuz will be removed when getBuildRecords()
42# is moved, as well as when the generalisation of findBuildCandidate()
43# is completed.
44from lp.soyuz.model.buildqueue import BuildQueue, specific_job_classes
45from lp.registry.interfaces.person import validate_public_person50from lp.registry.interfaces.person import validate_public_person
46from canonical.launchpad.helpers import filenameToContentType
47from lp.services.job.interfaces.job import JobStatus51from lp.services.job.interfaces.job import JobStatus
52# XXX Michael Nelson 2010-01-13 bug=491330
53# These dependencies on soyuz will be removed when getBuildRecords()
54# is moved.
55from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
48from lp.soyuz.interfaces.buildrecords import IHasBuildRecords56from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
49from lp.soyuz.interfaces.distroarchseries import IDistroArchSeriesSet57from lp.soyuz.interfaces.distroarchseries import IDistroArchSeriesSet
50from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
51from canonical.launchpad.webapp.interfaces import NotFoundError
52from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
53from lp.buildmaster.interfaces.builder import (
54 BuildDaemonError, BuildSlaveFailure, CannotBuild, CannotFetchFile,
55 CannotResumeHost, IBuilder, IBuilderSet, ProtocolVersionMismatch)
56from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
57from lp.soyuz.model.buildpackagejob import BuildPackageJob58from lp.soyuz.model.buildpackagejob import BuildPackageJob
58from canonical.launchpad.webapp import urlappend
59from canonical.launchpad.webapp.interfaces import (
60 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
61from canonical.lazr.utils import safe_hasattr
62from canonical.librarian.utils import copy_and_close
6359
6460
65class TimeoutHTTPConnection(httplib.HTTPConnection):61class TimeoutHTTPConnection(httplib.HTTPConnection):
6662
=== modified file 'lib/lp/buildmaster/model/buildfarmjobbehavior.py'
--- lib/lp/buildmaster/model/buildfarmjobbehavior.py 2010-02-11 19:11:11 +0000
+++ lib/lp/buildmaster/model/buildfarmjobbehavior.py 2010-03-08 21:22:31 +0000
@@ -26,8 +26,8 @@
26from lp.buildmaster.interfaces.builder import CorruptBuildID26from lp.buildmaster.interfaces.builder import CorruptBuildID
27from lp.buildmaster.interfaces.buildfarmjobbehavior import (27from lp.buildmaster.interfaces.buildfarmjobbehavior import (
28 BuildBehaviorMismatch, IBuildFarmJobBehavior)28 BuildBehaviorMismatch, IBuildFarmJobBehavior)
29from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
29from lp.services.job.interfaces.job import JobStatus30from lp.services.job.interfaces.job import JobStatus
30from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
3131
3232
33class BuildFarmJobBehaviorBase:33class BuildFarmJobBehaviorBase:
3434
=== renamed file 'lib/lp/soyuz/model/buildqueue.py' => 'lib/lp/buildmaster/model/buildqueue.py'
--- lib/lp/soyuz/model/buildqueue.py 2010-02-26 16:07:32 +0000
+++ lib/lp/buildmaster/model/buildqueue.py 2010-03-08 21:22:31 +0000
@@ -31,10 +31,10 @@
31 BuildFarmJobType, IBuildFarmJob)31 BuildFarmJobType, IBuildFarmJob)
32from lp.buildmaster.interfaces.buildfarmjobbehavior import (32from lp.buildmaster.interfaces.buildfarmjobbehavior import (
33 IBuildFarmJobBehavior)33 IBuildFarmJobBehavior)
34from lp.buildmaster.interfaces.buildqueue import IBuildQueue, IBuildQueueSet
34from lp.services.job.interfaces.job import JobStatus35from lp.services.job.interfaces.job import JobStatus
35from lp.services.job.model.job import Job36from lp.services.job.model.job import Job
36from lp.soyuz.interfaces.build import BuildStatus37from lp.soyuz.interfaces.build import BuildStatus
37from lp.soyuz.interfaces.buildqueue import IBuildQueue, IBuildQueueSet
38from lp.soyuz.model.buildpackagejob import BuildPackageJob38from lp.soyuz.model.buildpackagejob import BuildPackageJob
39from canonical.launchpad.webapp.interfaces import (39from canonical.launchpad.webapp.interfaces import (
40 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)40 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
@@ -71,7 +71,7 @@
71 GROUP BY processor, virtualized;71 GROUP BY processor, virtualized;
72 """72 """
73 results = store.execute(builder_data).get_all()73 results = store.execute(builder_data).get_all()
74 builders_in_total = builders_for_job = virtualized_total = 074 builders_in_total = virtualized_total = 0
7575
76 builder_stats = defaultdict(int)76 builder_stats = defaultdict(int)
77 for processor, virtualized, count in results:77 for processor, virtualized, count in results:
7878
=== modified file 'lib/lp/buildmaster/tests/test_builder.py'
--- lib/lp/buildmaster/tests/test_builder.py 2010-02-19 12:07:39 +0000
+++ lib/lp/buildmaster/tests/test_builder.py 2010-03-08 21:22:31 +0000
@@ -12,18 +12,15 @@
12 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)12 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
13from canonical.testing import LaunchpadZopelessLayer13from canonical.testing import LaunchpadZopelessLayer
14from lp.buildmaster.interfaces.builder import IBuilderSet14from lp.buildmaster.interfaces.builder import IBuilderSet
15from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
16from lp.buildmaster.interfaces.buildfarmjobbehavior import (15from lp.buildmaster.interfaces.buildfarmjobbehavior import (
17 IBuildFarmJobBehavior)16 IBuildFarmJobBehavior)
18from lp.buildmaster.model.buildfarmjobbehavior import IdleBuildBehavior17from lp.buildmaster.model.buildfarmjobbehavior import IdleBuildBehavior
19from lp.code.interfaces.sourcepackagerecipebuild import (18from lp.buildmaster.model.buildqueue import BuildQueue
20 ISourcePackageRecipeBuildSource)
21from lp.soyuz.interfaces.archive import ArchivePurpose19from lp.soyuz.interfaces.archive import ArchivePurpose
22from lp.soyuz.interfaces.build import BuildStatus, IBuildSet20from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
23from lp.soyuz.interfaces.publishing import PackagePublishingStatus21from lp.soyuz.interfaces.publishing import PackagePublishingStatus
24from lp.soyuz.model.binarypackagebuildbehavior import (22from lp.soyuz.model.binarypackagebuildbehavior import (
25 BinaryPackageBuildBehavior)23 BinaryPackageBuildBehavior)
26from lp.soyuz.model.buildqueue import BuildQueue
27from lp.soyuz.tests.test_publishing import SoyuzTestPublisher24from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
28from lp.testing import TestCaseWithFactory25from lp.testing import TestCaseWithFactory
2926
@@ -79,7 +76,7 @@
7976
80 # Make a new PPA and give it some builds.77 # Make a new PPA and give it some builds.
81 self.ppa_joe = self.factory.makeArchive(name="joesppa")78 self.ppa_joe = self.factory.makeArchive(name="joesppa")
82 builds = self.publisher.getPubSource(79 self.publisher.getPubSource(
83 sourcename="gedit", status=PackagePublishingStatus.PUBLISHED,80 sourcename="gedit", status=PackagePublishingStatus.PUBLISHED,
84 archive=self.ppa_joe).createMissingBuilds()81 archive=self.ppa_joe).createMissingBuilds()
8582
8683
=== modified file 'lib/lp/buildmaster/tests/test_buildmaster_documentation.py'
--- lib/lp/buildmaster/tests/test_buildmaster_documentation.py 2010-01-12 17:55:46 +0000
+++ lib/lp/buildmaster/tests/test_buildmaster_documentation.py 2010-03-08 21:22:31 +0000
@@ -39,6 +39,11 @@
39 setUp=setUp, tearDown=tearDown,39 setUp=setUp, tearDown=tearDown,
40 layer=LaunchpadFunctionalLayer,40 layer=LaunchpadFunctionalLayer,
41 ),41 ),
42 'buildqueue.txt': LayeredDocFileSuite(
43 '../doc/buildqueue.txt',
44 setUp=setUp, tearDown=tearDown,
45 layer=LaunchpadFunctionalLayer,
46 ),
42 }47 }
4348
44def test_suite():49def test_suite():
4550
=== renamed file 'lib/lp/soyuz/tests/test_buildqueue.py' => 'lib/lp/buildmaster/tests/test_buildqueue.py'
--- lib/lp/soyuz/tests/test_buildqueue.py 2010-03-08 10:47:56 +0000
+++ lib/lp/buildmaster/tests/test_buildqueue.py 2010-03-08 21:22:31 +0000
@@ -16,13 +16,13 @@
1616
17from lp.buildmaster.interfaces.builder import IBuilderSet17from lp.buildmaster.interfaces.builder import IBuilderSet
18from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType18from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
19from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
19from lp.buildmaster.model.builder import specific_job_classes20from lp.buildmaster.model.builder import specific_job_classes
20from lp.buildmaster.model.buildfarmjob import BuildFarmJob21from lp.buildmaster.model.buildfarmjob import BuildFarmJob
22from lp.buildmaster.model.buildqueue import BuildQueue, get_builder_data
21from lp.services.job.model.job import Job23from lp.services.job.model.job import Job
22from lp.soyuz.interfaces.archive import ArchivePurpose24from lp.soyuz.interfaces.archive import ArchivePurpose
23from lp.soyuz.interfaces.build import BuildStatus25from lp.soyuz.interfaces.build import BuildStatus
24from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
25from lp.soyuz.model.buildqueue import BuildQueue, get_builder_data
26from lp.soyuz.model.processor import ProcessorFamilySet26from lp.soyuz.model.processor import ProcessorFamilySet
27from lp.soyuz.interfaces.publishing import PackagePublishingStatus27from lp.soyuz.interfaces.publishing import PackagePublishingStatus
28from lp.soyuz.model.build import Build28from lp.soyuz.model.build import Build
2929
=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
--- lib/lp/buildmaster/tests/test_manager.py 2010-01-21 08:53:21 +0000
+++ lib/lp/buildmaster/tests/test_manager.py 2010-03-08 21:22:31 +0000
@@ -18,20 +18,20 @@
1818
19from canonical.buildd.tests import BuilddSlaveTestSetup19from canonical.buildd.tests import BuilddSlaveTestSetup
20from canonical.config import config20from canonical.config import config
21from canonical.launchpad.ftests import ANONYMOUS, login
22from canonical.launchpad.scripts.logger import BufferLogger
23from canonical.testing.layers import (
24 LaunchpadScriptLayer, LaunchpadZopelessLayer, TwistedLayer)
25from lp.buildmaster.interfaces.builder import IBuilderSet
26from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
21from lp.buildmaster.manager import (27from lp.buildmaster.manager import (
22 BaseDispatchResult, BuilddManager, FailDispatchResult, RecordingSlave,28 BaseDispatchResult, BuilddManager, FailDispatchResult, RecordingSlave,
23 ResetDispatchResult, buildd_success_result_map)29 ResetDispatchResult, buildd_success_result_map)
24from lp.buildmaster.tests.harness import BuilddManagerTestSetup30from lp.buildmaster.tests.harness import BuilddManagerTestSetup
25from canonical.launchpad.ftests import ANONYMOUS, login31from lp.registry.interfaces.distribution import IDistributionSet
32from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
26from lp.soyuz.tests.soyuzbuilddhelpers import SaneBuildingSlave33from lp.soyuz.tests.soyuzbuilddhelpers import SaneBuildingSlave
27from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
28from lp.buildmaster.interfaces.builder import IBuilderSet
29from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
30from lp.registry.interfaces.distribution import IDistributionSet
31from canonical.launchpad.scripts.logger import BufferLogger
32from lp.soyuz.tests.test_publishing import SoyuzTestPublisher34from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
33from canonical.testing.layers import (
34 LaunchpadScriptLayer, LaunchpadZopelessLayer, TwistedLayer)
3535
3636
37class TestRecordingSlaves(TrialTestCase):37class TestRecordingSlaves(TrialTestCase):
@@ -482,7 +482,7 @@
482 test_publisher = SoyuzTestPublisher()482 test_publisher = SoyuzTestPublisher()
483 ubuntu = getUtility(IDistributionSet).getByName('ubuntu')483 ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
484 hoary = ubuntu.getSeries('hoary')484 hoary = ubuntu.getSeries('hoary')
485 unused = test_publisher.setUpDefaultDistroSeries(hoary)485 test_publisher.setUpDefaultDistroSeries(hoary)
486 test_publisher.addFakeChroots()486 test_publisher.addFakeChroots()
487 login(ANONYMOUS)487 login(ANONYMOUS)
488488
489489
=== modified file 'lib/lp/code/model/sourcepackagerecipebuild.py'
--- lib/lp/code/model/sourcepackagerecipebuild.py 2010-02-19 06:34:18 +0000
+++ lib/lp/code/model/sourcepackagerecipebuild.py 2010-03-08 21:22:31 +0000
@@ -24,6 +24,7 @@
24from lp.buildmaster.interfaces.buildbase import IBuildBase24from lp.buildmaster.interfaces.buildbase import IBuildBase
25from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType25from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
26from lp.buildmaster.model.buildbase import BuildBase26from lp.buildmaster.model.buildbase import BuildBase
27from lp.buildmaster.model.buildqueue import BuildQueue
27from lp.buildmaster.model.packagebuildfarmjob import PackageBuildFarmJob28from lp.buildmaster.model.packagebuildfarmjob import PackageBuildFarmJob
28from lp.code.interfaces.sourcepackagerecipebuild import (29from lp.code.interfaces.sourcepackagerecipebuild import (
29 ISourcePackageRecipeBuildJob, ISourcePackageRecipeBuildJobSource,30 ISourcePackageRecipeBuildJob, ISourcePackageRecipeBuildJobSource,
@@ -34,7 +35,6 @@
34 default_component_dependency_name,)35 default_component_dependency_name,)
35from lp.soyuz.interfaces.build import BuildStatus36from lp.soyuz.interfaces.build import BuildStatus
36from lp.soyuz.interfaces.component import IComponentSet37from lp.soyuz.interfaces.component import IComponentSet
37from lp.soyuz.model.buildqueue import BuildQueue
38from lp.soyuz.model.sourcepackagerelease import SourcePackageRelease38from lp.soyuz.model.sourcepackagerelease import SourcePackageRelease
3939
4040
4141
=== modified file 'lib/lp/code/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/tests/test_sourcepackagerecipe.py 2010-02-05 15:06:28 +0000
+++ lib/lp/code/tests/test_sourcepackagerecipe.py 2010-03-08 21:22:31 +0000
@@ -20,13 +20,13 @@
2020
21from lp.archiveuploader.permission import (21from lp.archiveuploader.permission import (
22 ArchiveDisabled, CannotUploadToArchive, InvalidPocketForPPA)22 ArchiveDisabled, CannotUploadToArchive, InvalidPocketForPPA)
23from lp.buildmaster.interfaces.buildqueue import IBuildQueue
24from lp.buildmaster.model.buildqueue import BuildQueue
23from lp.code.interfaces.sourcepackagerecipe import (25from lp.code.interfaces.sourcepackagerecipe import (
24 ForbiddenInstruction, ISourcePackageRecipe, ISourcePackageRecipeSource,26 ForbiddenInstruction, ISourcePackageRecipe, ISourcePackageRecipeSource,
25 TooNewRecipeFormat)27 TooNewRecipeFormat)
26from lp.code.interfaces.sourcepackagerecipebuild import (28from lp.code.interfaces.sourcepackagerecipebuild import (
27 ISourcePackageRecipeBuild, ISourcePackageRecipeBuildJob)29 ISourcePackageRecipeBuild, ISourcePackageRecipeBuildJob)
28from lp.soyuz.model.buildqueue import (
29 BuildQueue)
30from lp.code.model.sourcepackagerecipebuild import (30from lp.code.model.sourcepackagerecipebuild import (
31 SourcePackageRecipeBuildJob)31 SourcePackageRecipeBuildJob)
32from lp.code.model.sourcepackagerecipe import (32from lp.code.model.sourcepackagerecipe import (
@@ -35,8 +35,6 @@
35from lp.services.job.interfaces.job import (35from lp.services.job.interfaces.job import (
36 IJob, JobStatus)36 IJob, JobStatus)
37from lp.soyuz.interfaces.archive import ArchivePurpose37from lp.soyuz.interfaces.archive import ArchivePurpose
38from lp.soyuz.interfaces.buildqueue import (
39 IBuildQueue)
40from lp.testing import login_person, TestCaseWithFactory38from lp.testing import login_person, TestCaseWithFactory
4139
4240
4341
=== modified file 'lib/lp/code/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/code/tests/test_sourcepackagerecipebuild.py 2010-02-05 15:06:28 +0000
+++ lib/lp/code/tests/test_sourcepackagerecipebuild.py 2010-03-08 21:22:31 +0000
@@ -14,10 +14,10 @@
14from canonical.testing.layers import DatabaseFunctionalLayer14from canonical.testing.layers import DatabaseFunctionalLayer
1515
16from lp.buildmaster.interfaces.buildbase import IBuildBase16from lp.buildmaster.interfaces.buildbase import IBuildBase
17from lp.buildmaster.interfaces.buildqueue import IBuildQueue
17from lp.code.interfaces.sourcepackagerecipebuild import (18from lp.code.interfaces.sourcepackagerecipebuild import (
18 ISourcePackageRecipeBuildJob, ISourcePackageRecipeBuild,19 ISourcePackageRecipeBuildJob, ISourcePackageRecipeBuild,
19 ISourcePackageRecipeBuildSource)20 ISourcePackageRecipeBuildSource)
20from lp.soyuz.interfaces.buildqueue import IBuildQueue
21from lp.testing import TestCaseWithFactory21from lp.testing import TestCaseWithFactory
2222
2323
2424
=== modified file 'lib/lp/soyuz/browser/build.py'
--- lib/lp/soyuz/browser/build.py 2010-02-24 13:39:16 +0000
+++ lib/lp/soyuz/browser/build.py 2010-03-08 21:22:31 +0000
@@ -14,6 +14,7 @@
14 'BuildView',14 'BuildView',
15 ]15 ]
1616
17from lazr.delegates import delegates
17from zope.component import getUtility18from zope.component import getUtility
18from zope.interface import implements19from zope.interface import implements
1920
@@ -21,13 +22,6 @@
21from canonical.launchpad import _22from canonical.launchpad import _
22from canonical.launchpad.browser.librarian import (23from canonical.launchpad.browser.librarian import (
23 FileNavigationMixin, ProxiedLibraryFileAlias)24 FileNavigationMixin, ProxiedLibraryFileAlias)
24from canonical.lazr.utils import safe_hasattr
25from lp.soyuz.interfaces.build import (
26 BuildStatus, IBuild, IBuildRescoreForm)
27from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
28from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
29from canonical.launchpad.interfaces.launchpad import UnexpectedFormData
30from lp.soyuz.interfaces.queue import PackageUploadStatus
31from canonical.launchpad.webapp import (25from canonical.launchpad.webapp import (
32 action, canonical_url, enabled_with_permission, ContextMenu,26 action, canonical_url, enabled_with_permission, ContextMenu,
33 GetitemNavigation, Link, LaunchpadFormView, LaunchpadView,27 GetitemNavigation, Link, LaunchpadFormView, LaunchpadView,
@@ -35,8 +29,14 @@
35from canonical.launchpad.webapp.authorization import check_permission29from canonical.launchpad.webapp.authorization import check_permission
36from canonical.launchpad.webapp.batching import BatchNavigator30from canonical.launchpad.webapp.batching import BatchNavigator
37from canonical.launchpad.webapp.interfaces import ICanonicalUrlData31from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
38from lazr.delegates import delegates32from canonical.lazr.utils import safe_hasattr
33from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
39from lp.services.job.interfaces.job import JobStatus34from lp.services.job.interfaces.job import JobStatus
35from lp.soyuz.interfaces.build import (
36 BuildStatus, IBuild, IBuildRescoreForm)
37from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
38from canonical.launchpad.interfaces.launchpad import UnexpectedFormData
39from lp.soyuz.interfaces.queue import PackageUploadStatus
4040
4141
42class BuildUrl:42class BuildUrl:
4343
=== modified file 'lib/lp/soyuz/browser/tests/builder-views.txt'
--- lib/lp/soyuz/browser/tests/builder-views.txt 2010-02-22 13:23:24 +0000
+++ lib/lp/soyuz/browser/tests/builder-views.txt 2010-03-08 21:22:31 +0000
@@ -129,7 +129,7 @@
129Before checking if it works as expected we will setup an environment129Before checking if it works as expected we will setup an environment
130where builder 'Frog' is building a job from Celso's private PPA.130where builder 'Frog' is building a job from Celso's private PPA.
131131
132 >>> from lp.soyuz.model.buildqueue import BuildQueue132 >>> from lp.buildmaster.model.buildqueue import BuildQueue
133 >>> from canonical.launchpad.interfaces import (133 >>> from canonical.launchpad.interfaces import (
134 ... IBuilderSet, IPersonSet)134 ... IBuilderSet, IPersonSet)
135135
136136
=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml 2010-02-26 16:00:58 +0000
+++ lib/lp/soyuz/configure.zcml 2010-03-08 21:22:31 +0000
@@ -518,66 +518,6 @@
518 interface="lp.soyuz.interfaces.build.IBuildSet"/>518 interface="lp.soyuz.interfaces.build.IBuildSet"/>
519 </securedutility>519 </securedutility>
520520
521 <!-- BuilderSet -->
522
523 <securedutility
524 class="canonical.launchpad.database.BuilderSet"
525 provides="lp.buildmaster.interfaces.builder.IBuilderSet">
526 <allow
527 interface="lp.buildmaster.interfaces.builder.IBuilderSet"/>
528 </securedutility>
529 <adapter
530 provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
531 for="lp.buildmaster.interfaces.builder.IBuilder"
532 factory="canonical.launchpad.webapp.breadcrumb.TitleBreadcrumb"
533 permission="zope.Public"/>
534 <adapter
535 provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
536 for="lp.buildmaster.interfaces.builder.IBuilderSet"
537 factory="lp.soyuz.browser.builder.BuilderSetBreadcrumb"
538 permission="zope.Public"/>
539
540 <!-- Builder -->
541
542 <class
543 class="canonical.launchpad.database.Builder">
544 <allow
545 interface="lp.buildmaster.interfaces.builder.IBuilder"/>
546 <allow
547 interface="canonical.launchpad.interfaces.IHasBuildRecords"/>
548 <require
549 permission="launchpad.Edit"
550 set_schema="lp.buildmaster.interfaces.builder.IBuilder"/>
551 </class>
552
553 <!-- BuildQueue -->
554
555 <class
556 class="canonical.launchpad.database.BuildQueue">
557 <allow
558 interface="canonical.launchpad.interfaces.IBuildQueue"/>
559
560 <!-- XXX cprov 2005-10-20
561
562 bug=3580: We need a autobuild celebrity. -->
563
564
565 <!-- Grant permissions to write on BuildQueue and Build. -->
566
567 <require
568 permission="zope.Public"
569 set_attributes="lastscore builder logtail date_started"/>
570 </class>
571
572 <!-- BuildQueueSet -->
573
574 <securedutility
575 class="canonical.launchpad.database.BuildQueueSet"
576 provides="canonical.launchpad.interfaces.IBuildQueueSet">
577 <allow
578 interface="canonical.launchpad.interfaces.IBuildQueueSet"/>
579 </securedutility>
580
581 <!-- DistroArchSeriesBinaryPackage -->521 <!-- DistroArchSeriesBinaryPackage -->
582522
583 <class523 <class
584524
=== modified file 'lib/lp/soyuz/doc/buildd-dispatching.txt'
--- lib/lp/soyuz/doc/buildd-dispatching.txt 2010-01-20 01:23:38 +0000
+++ lib/lp/soyuz/doc/buildd-dispatching.txt 2010-03-08 21:22:31 +0000
@@ -61,7 +61,7 @@
6161
62Clean up previous BuildQueue results from sampledata:62Clean up previous BuildQueue results from sampledata:
6363
64 >>> from lp.soyuz.interfaces.buildqueue import IBuildQueueSet64 >>> from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
65 >>> lost_job = getUtility(IBuildQueueSet).get(1)65 >>> lost_job = getUtility(IBuildQueueSet).get(1)
66 >>> lost_job.builder.name66 >>> lost_job.builder.name
67 u'bob'67 u'bob'
6868
=== modified file 'lib/lp/soyuz/model/build.py'
--- lib/lp/soyuz/model/build.py 2010-02-16 02:27:24 +0000
+++ lib/lp/soyuz/model/build.py 2010-03-08 21:22:31 +0000
@@ -43,6 +43,7 @@
43from lp.archivepublisher.utils import get_ppa_reference43from lp.archivepublisher.utils import get_ppa_reference
44from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType44from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
45from lp.buildmaster.model.buildbase import BuildBase45from lp.buildmaster.model.buildbase import BuildBase
46from lp.buildmaster.model.buildqueue import BuildQueue
46from lp.registry.interfaces.pocket import PackagePublishingPocket47from lp.registry.interfaces.pocket import PackagePublishingPocket
47from lp.services.job.model.job import Job48from lp.services.job.model.job import Job
48from lp.soyuz.adapters.archivedependencies import get_components_for_building49from lp.soyuz.adapters.archivedependencies import get_components_for_building
@@ -54,7 +55,6 @@
54from lp.soyuz.model.binarypackagerelease import BinaryPackageRelease55from lp.soyuz.model.binarypackagerelease import BinaryPackageRelease
55from lp.buildmaster.model.builder import Builder56from lp.buildmaster.model.builder import Builder
56from lp.soyuz.model.buildpackagejob import BuildPackageJob57from lp.soyuz.model.buildpackagejob import BuildPackageJob
57from lp.soyuz.model.buildqueue import BuildQueue
58from lp.soyuz.model.files import BinaryPackageFile58from lp.soyuz.model.files import BinaryPackageFile
59from lp.soyuz.model.publishing import SourcePackagePublishingHistory59from lp.soyuz.model.publishing import SourcePackagePublishingHistory
60from lp.soyuz.model.queue import (60from lp.soyuz.model.queue import (
6161
=== modified file 'lib/lp/soyuz/tests/test_build.py'
--- lib/lp/soyuz/tests/test_build.py 2010-02-15 21:33:26 +0000
+++ lib/lp/soyuz/tests/test_build.py 2010-03-08 21:22:31 +0000
@@ -8,7 +8,6 @@
8import unittest8import unittest
99
10from storm.store import Store10from storm.store import Store
11import transaction
12from zope.component import getUtility11from zope.component import getUtility
1312
14from canonical.database.constants import UTC_NOW13from canonical.database.constants import UTC_NOW
@@ -16,10 +15,10 @@
16from lp.services.job.model.job import Job15from lp.services.job.model.job import Job
17from lp.buildmaster.interfaces.buildbase import IBuildBase16from lp.buildmaster.interfaces.buildbase import IBuildBase
18from lp.buildmaster.interfaces.builder import IBuilderSet17from lp.buildmaster.interfaces.builder import IBuilderSet
18from lp.buildmaster.model.buildqueue import BuildQueue
19from lp.soyuz.interfaces.component import IComponentSet19from lp.soyuz.interfaces.component import IComponentSet
20from lp.soyuz.interfaces.build import BuildStatus, IBuild, IBuildSet20from lp.soyuz.interfaces.build import BuildStatus, IBuild, IBuildSet
21from lp.soyuz.interfaces.publishing import PackagePublishingStatus21from lp.soyuz.interfaces.publishing import PackagePublishingStatus
22from lp.soyuz.model.buildqueue import BuildQueue
23from lp.soyuz.model.buildpackagejob import BuildPackageJob22from lp.soyuz.model.buildpackagejob import BuildPackageJob
24from lp.soyuz.model.processor import ProcessorFamilySet23from lp.soyuz.model.processor import ProcessorFamilySet
25from lp.soyuz.tests.test_publishing import SoyuzTestPublisher24from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
2625
=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py 2010-03-06 21:18:11 +0000
+++ lib/lp/testing/factory.py 2010-03-08 21:22:31 +0000
@@ -69,6 +69,7 @@
69from lp.bugs.interfaces.bugwatch import IBugWatchSet69from lp.bugs.interfaces.bugwatch import IBugWatchSet
70from lp.buildmaster.interfaces.builder import IBuilderSet70from lp.buildmaster.interfaces.builder import IBuilderSet
71from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType71from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
72from lp.buildmaster.model.buildqueue import BuildQueue
7273
73from lp.code.enums import (74from lp.code.enums import (
74 BranchMergeProposalStatus, BranchSubscriptionNotificationLevel,75 BranchMergeProposalStatus, BranchSubscriptionNotificationLevel,
@@ -129,7 +130,6 @@
129from lp.soyuz.interfaces.processor import IProcessorFamilySet130from lp.soyuz.interfaces.processor import IProcessorFamilySet
130from lp.soyuz.interfaces.publishing import PackagePublishingStatus131from lp.soyuz.interfaces.publishing import PackagePublishingStatus
131from lp.soyuz.interfaces.section import ISectionSet132from lp.soyuz.interfaces.section import ISectionSet
132from lp.soyuz.model.buildqueue import BuildQueue
133from lp.soyuz.model.processor import ProcessorFamilySet133from lp.soyuz.model.processor import ProcessorFamilySet
134from lp.soyuz.model.publishing import SourcePackagePublishingHistory134from lp.soyuz.model.publishing import SourcePackagePublishingHistory
135135
136136
=== modified file 'lib/lp/translations/doc/translationtemplatesbuildbehavior.txt'
--- lib/lp/translations/doc/translationtemplatesbuildbehavior.txt 2010-01-13 20:48:37 +0000
+++ lib/lp/translations/doc/translationtemplatesbuildbehavior.txt 2010-03-08 21:22:31 +0000
@@ -47,9 +47,9 @@
47Use the ITranslationTemplatesBuildJobSource to create a47Use the ITranslationTemplatesBuildJobSource to create a
48TranslationTemplatesBuildJob.48TranslationTemplatesBuildJob.
4949
50 >>> from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
50 >>> from lp.translations.interfaces.translationtemplatesbuildjob import (51 >>> from lp.translations.interfaces.translationtemplatesbuildjob import (
51 ... ITranslationTemplatesBuildJobSource)52 ... ITranslationTemplatesBuildJobSource)
52 >>> from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
53 >>> branch = factory.makeBranch()53 >>> branch = factory.makeBranch()
54 >>> specific_job_source = getUtility(ITranslationTemplatesBuildJobSource)54 >>> specific_job_source = getUtility(ITranslationTemplatesBuildJobSource)
55 >>> specific_job = specific_job_source.create(branch)55 >>> specific_job = specific_job_source.create(branch)
5656
=== modified file 'lib/lp/translations/model/translationtemplatesbuildjob.py'
--- lib/lp/translations/model/translationtemplatesbuildjob.py 2010-03-02 17:44:45 +0000
+++ lib/lp/translations/model/translationtemplatesbuildjob.py 2010-03-08 21:22:31 +0000
@@ -21,9 +21,9 @@
21from lp.buildmaster.interfaces.buildfarmjob import (21from lp.buildmaster.interfaces.buildfarmjob import (
22 BuildFarmJobType, IBuildFarmJob, ISpecificBuildFarmJobClass)22 BuildFarmJobType, IBuildFarmJob, ISpecificBuildFarmJobClass)
23from lp.buildmaster.model.buildfarmjob import BuildFarmJob23from lp.buildmaster.model.buildfarmjob import BuildFarmJob
24from lp.buildmaster.model.buildqueue import BuildQueue
24from lp.code.interfaces.branchjob import IBranchJob, IRosettaUploadJobSource25from lp.code.interfaces.branchjob import IBranchJob, IRosettaUploadJobSource
25from lp.code.model.branchjob import BranchJob, BranchJobDerived, BranchJobType26from lp.code.model.branchjob import BranchJob, BranchJobDerived, BranchJobType
26from lp.soyuz.model.buildqueue import BuildQueue
27from lp.translations.interfaces.translationtemplatesbuildjob import (27from lp.translations.interfaces.translationtemplatesbuildjob import (
28 ITranslationTemplatesBuildJobSource)28 ITranslationTemplatesBuildJobSource)
29from lp.translations.pottery.detect_intltool import is_intltool_structure29from lp.translations.pottery.detect_intltool import is_intltool_structure
3030
=== modified file 'lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py'
--- lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py 2010-02-19 23:45:33 +0000
+++ lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py 2010-03-08 21:22:31 +0000
@@ -16,8 +16,8 @@
16from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet16from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
17from lp.buildmaster.interfaces.buildfarmjobbehavior import (17from lp.buildmaster.interfaces.buildfarmjobbehavior import (
18 IBuildFarmJobBehavior)18 IBuildFarmJobBehavior)
19from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
19from lp.soyuz.interfaces.build import BuildStatus20from lp.soyuz.interfaces.build import BuildStatus
20from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
21from lp.testing import TestCaseWithFactory21from lp.testing import TestCaseWithFactory
22from lp.testing.fakemethod import FakeMethod22from lp.testing.fakemethod import FakeMethod
2323
@@ -149,7 +149,6 @@
149 queue_item = FakeBuildQueue(behavior)149 queue_item = FakeBuildQueue(behavior)
150 slave_status = behavior._builder.slave.status150 slave_status = behavior._builder.slave.status
151 builder = behavior._builder151 builder = behavior._builder
152 slave = builder.slave
153152
154 behavior.dispatchBuildToSlave(queue_item, logging)153 behavior.dispatchBuildToSlave(queue_item, logging)
155154
156155
=== modified file 'lib/lp/translations/tests/test_translationtemplatesbuildjob.py'
--- lib/lp/translations/tests/test_translationtemplatesbuildjob.py 2010-03-02 17:44:45 +0000
+++ lib/lp/translations/tests/test_translationtemplatesbuildjob.py 2010-03-08 21:22:31 +0000
@@ -22,13 +22,13 @@
22 IBuildFarmJob, ISpecificBuildFarmJobClass)22 IBuildFarmJob, ISpecificBuildFarmJobClass)
23from lp.buildmaster.interfaces.buildfarmjobbehavior import (23from lp.buildmaster.interfaces.buildfarmjobbehavior import (
24 IBuildFarmJobBehavior)24 IBuildFarmJobBehavior)
25from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
26from lp.buildmaster.model.buildqueue import BuildQueue
25from lp.code.interfaces.branchjob import IBranchJob27from lp.code.interfaces.branchjob import IBranchJob
26from lp.code.model.branchjob import BranchJob28from lp.code.model.branchjob import BranchJob
27from lp.code.model.directbranchcommit import DirectBranchCommit29from lp.code.model.directbranchcommit import DirectBranchCommit
28from lp.codehosting.scanner import events30from lp.codehosting.scanner import events
29from lp.services.job.model.job import Job31from lp.services.job.model.job import Job
30from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
31from lp.soyuz.model.buildqueue import BuildQueue
32from lp.translations.interfaces.translations import (32from lp.translations.interfaces.translations import (
33 TranslationsBranchImportMode)33 TranslationsBranchImportMode)
34from lp.translations.interfaces.translationtemplatesbuildjob import (34from lp.translations.interfaces.translationtemplatesbuildjob import (