Launchpad itself

Merge lp:~thumper/launchpad/fix-codeimport-failure into lp:launchpad/db-devel

  1. fix-codeimport-failure
  2. Merge into db-devel
Proposed by Tim Penhey
Status: Merged
Approved by: Jonathan Lange
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~thumper/launchpad/fix-codeimport-failure
Merge into: lp:launchpad/db-devel
Diff against target: 92 lines (+8/-7)
7 files modified
lib/lp/buildmaster/interfaces/builder.py (+0/-2)
lib/lp/code/model/tests/test_codeimport.py (+1/-0)
lib/lp/soyuz/browser/tests/builder-views.txt (+2/-1)
lib/lp/soyuz/doc/build-estimated-dispatch-time.txt (+1/-1)
lib/lp/soyuz/doc/buildd-slavescanner.txt (+2/-1)
lib/lp/soyuz/doc/buildqueue.txt (+1/-1)
lib/lp/soyuz/interfaces/buildqueue.py (+1/-1)
To merge this branch: bzr merge lp:~thumper/launchpad/fix-codeimport-failure
Reviewer Review Type Date Requested Status
Jonathan Lange (community) Approve
Review via email: mp+17315@code.launchpad.net

Commit message

Fix issue with soyuz builder move, and fix broken code import test.

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :

fixes the issue with the soyuz builder move, and fixes the broken code import test.

Revision history for this message
Jonathan Lange (jml) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/buildmaster/interfaces/builder.py'
--- lib/lp/buildmaster/interfaces/builder.py 2010-01-13 04:41:19 +0000
+++ lib/lp/buildmaster/interfaces/builder.py 2010-01-13 20:49:12 +0000
@@ -25,8 +25,6 @@
25from canonical.launchpad import _25from canonical.launchpad import _
26from canonical.launchpad.fields import Title, Description26from canonical.launchpad.fields import Title, Description
27from lp.registry.interfaces.role import IHasOwner27from lp.registry.interfaces.role import IHasOwner
28from lp.buildmaster.interfaces.buildfarmjobbehavior import (
29 IBuildFarmJobBehavior)
30from canonical.launchpad.validators.name import name_validator28from canonical.launchpad.validators.name import name_validator
31from canonical.launchpad.validators.url import builder_url_validator29from canonical.launchpad.validators.url import builder_url_validator
3230
3331
=== modified file 'lib/lp/code/model/tests/test_codeimport.py'
--- lib/lp/code/model/tests/test_codeimport.py 2010-01-13 02:51:20 +0000
+++ lib/lp/code/model/tests/test_codeimport.py 2010-01-13 20:49:12 +0000
@@ -139,6 +139,7 @@
139 def test_deleteIncludesJob(self):139 def test_deleteIncludesJob(self):
140 """Ensure deleting CodeImport objects deletes associated jobs."""140 """Ensure deleting CodeImport objects deletes associated jobs."""
141 code_import = self.factory.makeCodeImport()141 code_import = self.factory.makeCodeImport()
142 login_person(getUtility(ILaunchpadCelebrities).vcs_imports.teamowner)
142 code_import_job = self.factory.makeCodeImportJob(code_import)143 code_import_job = self.factory.makeCodeImportJob(code_import)
143 job_id = code_import_job.id144 job_id = code_import_job.id
144 CodeImportJobSet().getById(job_id)145 CodeImportJobSet().getById(job_id)
145146
=== modified file 'lib/lp/soyuz/browser/tests/builder-views.txt'
--- lib/lp/soyuz/browser/tests/builder-views.txt 2009-12-14 21:13:49 +0000
+++ lib/lp/soyuz/browser/tests/builder-views.txt 2010-01-13 20:49:12 +0000
@@ -1,7 +1,8 @@
1= Builder View Classes and Pages =1= Builder View Classes and Pages =
22
3 >>> from zope.component import getMultiAdapter, getUtility3 >>> from zope.component import getMultiAdapter, getUtility
4 >>> from canonical.launchpad.interfaces import IBuildSet, IBuilderSet4 >>> from lp.buildmaster.interfaces.builder import IBuilderSet
5 >>> from lp.soyuz.interfaces.build import IBuildSet
5 >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest6 >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
67
7 >>> builder = getUtility(IBuilderSet).get(1)8 >>> builder = getUtility(IBuilderSet).get(1)
89
=== modified file 'lib/lp/soyuz/doc/build-estimated-dispatch-time.txt'
--- lib/lp/soyuz/doc/build-estimated-dispatch-time.txt 2010-01-12 08:57:36 +0000
+++ lib/lp/soyuz/doc/build-estimated-dispatch-time.txt 2010-01-13 20:49:12 +0000
@@ -6,7 +6,7 @@
66
7 >>> from canonical.launchpad.ftests import login7 >>> from canonical.launchpad.ftests import login
8 >>> login('celso.providelo@canonical.com')8 >>> login('celso.providelo@canonical.com')
9 >>> from canonical.launchpad.interfaces import IBuilderSet9 >>> from lp.buildmaster.interfaces.builder import IBuilderSet
10 >>> builder_set = getUtility(IBuilderSet)10 >>> builder_set = getUtility(IBuilderSet)
1111
12Do we have two builders?12Do we have two builders?
1313
=== modified file 'lib/lp/soyuz/doc/buildd-slavescanner.txt'
--- lib/lp/soyuz/doc/buildd-slavescanner.txt 2010-01-12 10:03:27 +0000
+++ lib/lp/soyuz/doc/buildd-slavescanner.txt 2010-01-13 20:49:12 +0000
@@ -176,7 +176,8 @@
176The slavescanner system also perform build-notification for the176The slavescanner system also perform build-notification for the
177following states: FAILEDTOBUILD and CHROOTWAIT177following states: FAILEDTOBUILD and CHROOTWAIT
178178
179 >>> from canonical.launchpad.interfaces import IBuildSet, IBuilderSet179 >>> from lp.buildmaster.interfaces.builder import IBuilderSet
180 >>> from lp.soyuz.interfaces.build import IBuildSet
180 >>> import datetime, pytz181 >>> import datetime, pytz
181182
182 >>> UTC = pytz.timezone('UTC')183 >>> UTC = pytz.timezone('UTC')
183184
=== modified file 'lib/lp/soyuz/doc/buildqueue.txt'
--- lib/lp/soyuz/doc/buildqueue.txt 2009-12-01 09:02:14 +0000
+++ lib/lp/soyuz/doc/buildqueue.txt 2010-01-13 20:49:12 +0000
@@ -113,7 +113,7 @@
113The sampledata contains an active job, being built by the 'bob'113The sampledata contains an active job, being built by the 'bob'
114builder.114builder.
115115
116 >>> from canonical.launchpad.interfaces import IBuilderSet116 >>> from lp.buildmaster.interfaces.builder import IBuilderSet
117117
118 >>> bob = getUtility(IBuilderSet)['bob']118 >>> bob = getUtility(IBuilderSet)['bob']
119 >>> job = bob.currentjob119 >>> job = bob.currentjob
120120
=== modified file 'lib/lp/soyuz/interfaces/buildqueue.py'
--- lib/lp/soyuz/interfaces/buildqueue.py 2010-01-11 21:02:31 +0000
+++ lib/lp/soyuz/interfaces/buildqueue.py 2010-01-13 20:49:12 +0000
@@ -18,10 +18,10 @@
18from lazr.restful.fields import Reference18from lazr.restful.fields import Reference
1919
20from canonical.launchpad import _20from canonical.launchpad import _
21from lp.buildmaster.interfaces.builder import IBuilder
21from lp.buildmaster.interfaces.buildfarmjob import (22from lp.buildmaster.interfaces.buildfarmjob import (
22 IBuildFarmJob, BuildFarmJobType)23 IBuildFarmJob, BuildFarmJobType)
23from lp.services.job.interfaces.job import IJob24from lp.services.job.interfaces.job import IJob
24from lp.soyuz.interfaces.builder import IBuilder
25from lp.soyuz.interfaces.processor import IProcessor25from lp.soyuz.interfaces.processor import IProcessor
2626
2727

Subscribers

People subscribed via source and target branches

to status/vote changes: