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

[Michael Nelson]

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.

[Robert Collins (lifeless)]

jfdi

review: Approve

[Michael Nelson (michael.nelson)]

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.

=== modified file 'lib/lp/buildmaster/manager.py'
--- lib/lp/buildmaster/manager.py	2010-08-30 15:00:23 +0000
+++ lib/lp/buildmaster/manager.py	2010-08-31 07:02:42 +0000
@@ -33,8 +33,7 @@
 from canonical.config import config
 from canonical.launchpad.webapp import urlappend
 from canonical.librarian.db import write_transaction
-from lp.buildmaster.interfaces.buildbase import (
-    BuildStatus, BUILDD_MANAGER_LOG_NAME)
+from lp.buildmaster.enums import BuildStatus
 from lp.services.twistedsupport.processmonitor import ProcessWithTimeout