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 on 2010-01-13
Status: Merged
Approved by: Jonathan Lange on 2010-01-13
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) 2010-01-13 Approve on 2010-01-13
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.
Tim Penhey (thumper) wrote :

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

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
1=== modified file 'lib/lp/buildmaster/interfaces/builder.py'
2--- lib/lp/buildmaster/interfaces/builder.py 2010-01-13 04:41:19 +0000
3+++ lib/lp/buildmaster/interfaces/builder.py 2010-01-13 20:49:12 +0000
4@@ -25,8 +25,6 @@
5 from canonical.launchpad import _
6 from canonical.launchpad.fields import Title, Description
7 from lp.registry.interfaces.role import IHasOwner
8-from lp.buildmaster.interfaces.buildfarmjobbehavior import (
9- IBuildFarmJobBehavior)
10 from canonical.launchpad.validators.name import name_validator
11 from canonical.launchpad.validators.url import builder_url_validator
12
13
14=== modified file 'lib/lp/code/model/tests/test_codeimport.py'
15--- lib/lp/code/model/tests/test_codeimport.py 2010-01-13 02:51:20 +0000
16+++ lib/lp/code/model/tests/test_codeimport.py 2010-01-13 20:49:12 +0000
17@@ -139,6 +139,7 @@
18 def test_deleteIncludesJob(self):
19 """Ensure deleting CodeImport objects deletes associated jobs."""
20 code_import = self.factory.makeCodeImport()
21+ login_person(getUtility(ILaunchpadCelebrities).vcs_imports.teamowner)
22 code_import_job = self.factory.makeCodeImportJob(code_import)
23 job_id = code_import_job.id
24 CodeImportJobSet().getById(job_id)
25
26=== modified file 'lib/lp/soyuz/browser/tests/builder-views.txt'
27--- lib/lp/soyuz/browser/tests/builder-views.txt 2009-12-14 21:13:49 +0000
28+++ lib/lp/soyuz/browser/tests/builder-views.txt 2010-01-13 20:49:12 +0000
29@@ -1,7 +1,8 @@
30 = Builder View Classes and Pages =
31
32 >>> from zope.component import getMultiAdapter, getUtility
33- >>> from canonical.launchpad.interfaces import IBuildSet, IBuilderSet
34+ >>> from lp.buildmaster.interfaces.builder import IBuilderSet
35+ >>> from lp.soyuz.interfaces.build import IBuildSet
36 >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
37
38 >>> builder = getUtility(IBuilderSet).get(1)
39
40=== modified file 'lib/lp/soyuz/doc/build-estimated-dispatch-time.txt'
41--- lib/lp/soyuz/doc/build-estimated-dispatch-time.txt 2010-01-12 08:57:36 +0000
42+++ lib/lp/soyuz/doc/build-estimated-dispatch-time.txt 2010-01-13 20:49:12 +0000
43@@ -6,7 +6,7 @@
44
45 >>> from canonical.launchpad.ftests import login
46 >>> login('celso.providelo@canonical.com')
47- >>> from canonical.launchpad.interfaces import IBuilderSet
48+ >>> from lp.buildmaster.interfaces.builder import IBuilderSet
49 >>> builder_set = getUtility(IBuilderSet)
50
51 Do we have two builders?
52
53=== modified file 'lib/lp/soyuz/doc/buildd-slavescanner.txt'
54--- lib/lp/soyuz/doc/buildd-slavescanner.txt 2010-01-12 10:03:27 +0000
55+++ lib/lp/soyuz/doc/buildd-slavescanner.txt 2010-01-13 20:49:12 +0000
56@@ -176,7 +176,8 @@
57 The slavescanner system also perform build-notification for the
58 following states: FAILEDTOBUILD and CHROOTWAIT
59
60- >>> from canonical.launchpad.interfaces import IBuildSet, IBuilderSet
61+ >>> from lp.buildmaster.interfaces.builder import IBuilderSet
62+ >>> from lp.soyuz.interfaces.build import IBuildSet
63 >>> import datetime, pytz
64
65 >>> UTC = pytz.timezone('UTC')
66
67=== modified file 'lib/lp/soyuz/doc/buildqueue.txt'
68--- lib/lp/soyuz/doc/buildqueue.txt 2009-12-01 09:02:14 +0000
69+++ lib/lp/soyuz/doc/buildqueue.txt 2010-01-13 20:49:12 +0000
70@@ -113,7 +113,7 @@
71 The sampledata contains an active job, being built by the 'bob'
72 builder.
73
74- >>> from canonical.launchpad.interfaces import IBuilderSet
75+ >>> from lp.buildmaster.interfaces.builder import IBuilderSet
76
77 >>> bob = getUtility(IBuilderSet)['bob']
78 >>> job = bob.currentjob
79
80=== modified file 'lib/lp/soyuz/interfaces/buildqueue.py'
81--- lib/lp/soyuz/interfaces/buildqueue.py 2010-01-11 21:02:31 +0000
82+++ lib/lp/soyuz/interfaces/buildqueue.py 2010-01-13 20:49:12 +0000
83@@ -18,10 +18,10 @@
84 from lazr.restful.fields import Reference
85
86 from canonical.launchpad import _
87+from lp.buildmaster.interfaces.builder import IBuilder
88 from lp.buildmaster.interfaces.buildfarmjob import (
89 IBuildFarmJob, BuildFarmJobType)
90 from lp.services.job.interfaces.job import IJob
91-from lp.soyuz.interfaces.builder import IBuilder
92 from lp.soyuz.interfaces.processor import IProcessor
93
94

Subscribers

People subscribed via source and target branches

to status/vote changes: