Launchpad itself

Merge lp:~michael.nelson/launchpad/test-fix-db-buildbase into lp:launchpad/db-devel

  1. test-fix-db-buildbase
  2. Merge into db-devel
Proposed by Michael Nelson
Status: Merged
Approved by: Robert Collins
Approved revision: no longer in the source branch.
Merged at revision: 9723
Proposed branch: lp:~michael.nelson/launchpad/test-fix-db-buildbase
Merge into: lp:launchpad/db-devel
Diff against target: 11 lines (+1/-2)
1 file modified
lib/lp/buildmaster/manager.py (+1/-2)
To merge this branch: bzr merge lp:~michael.nelson/launchpad/test-fix-db-buildbase
Reviewer Review Type Date Requested Status
Robert Collins (community) Approve
Review via email: mp+34166@code.launchpad.net

Description of the change

Testfix for:

https://lpbuildbot.canonical.com/builders/lucid_db_lp/builds/153/steps/shell_7/logs/summary

tested with:

bin/test -vvm lp.buildmaster.tests.test_manager -m lp.code.model.tests.test_sourcepackagerecipebuild -m lp.soyuz.tests.test_binarypackagebuild

which is not all the failures, but enough to show the identified issue of the buildbase import is fixed.

To post a comment you must log in.
Revision history for this message
Robert Collins (lifeless) wrote :

jfdi

review: Approve
Revision history for this message
Michael Nelson (michael.nelson) wrote :

On Tue, Aug 31, 2010 at 9:21 AM, Robert Collins
<email address hidden> wrote:
> Review: Approve
> jfdi

I did after waiting 30 seconds in case anyone was there :) It's landed
rs=me (r9723). Thanks anyway.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/buildmaster/manager.py'
2--- lib/lp/buildmaster/manager.py 2010-08-30 15:00:23 +0000
3+++ lib/lp/buildmaster/manager.py 2010-08-31 07:02:42 +0000
4@@ -33,8 +33,7 @@
5 from canonical.config import config
6 from canonical.launchpad.webapp import urlappend
7 from canonical.librarian.db import write_transaction
8-from lp.buildmaster.interfaces.buildbase import (
9- BuildStatus, BUILDD_MANAGER_LOG_NAME)
10+from lp.buildmaster.enums import BuildStatus
11 from lp.services.twistedsupport.processmonitor import ProcessWithTimeout
12
13

Subscribers

People subscribed via source and target branches

to status/vote changes: