Merge lp:~mwhudson/launchpad/bzr-2.1c1-update into lp:launchpad

[Michael Hudson-Doyle]

Upgrade to bzr 2.1rc2, with fixes for bug 514090 and bug 513432

[Michael Hudson-Doyle (mwhudson)]

Hi there,

This branch updates Launchpad to bzr 2.1rc1. It's mostly very boring fallout from bzrlib's Server class setUp -> start_server renaming although there a few test infrastructure and logging related changes too.

[Henning Eggers (henninge)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

> Hi there,
>
> This branch updates Launchpad to bzr 2.1rc1. It's mostly very boring fallout from bzrlib's Server class setUp -> start_server renaming although there a few test infrastructure and logging related changes too.
>

Yes, this was actually kind of boring but I managed to stay awake ... ;-)

As a consequence, I only have one marginal suggestion. But if you don't
feel like doing something about it, feel free to land this branch ... ;)
Thank you for doing this boring work!

 review approve code

Cheers,
Henning

> === modified file 'lib/lp/codehosting/scanner/branch_scanner.py'
> --- lib/lp/codehosting/scanner/branch_scanner.py 2009-12-17 02:00:16 +0000
> +++ lib/lp/codehosting/scanner/branch_scanner.py 2010-02-01 05:13:16 +0000
> @@ -23,7 +23,7 @@
> from lp.codehosting.scanner.bzrsync import (
> BzrSync, schedule_diff_updates, schedule_translation_upload)
> from lp.codehosting.scanner.fixture import (
> - Fixtures, make_zope_event_fixture, run_with_fixture)
> + Fixtures, make_zope_event_fixture, run_with_fixture, ServerFixture)
> from canonical.launchpad.webapp import canonical_url, errorlog
>
>
> @@ -100,7 +100,8 @@
> schedule_translation_upload,
> ]
> server = get_scanner_server()
> - fixture = Fixtures([server, make_zope_event_fixture(*event_handlers)])
> + fixture = Fixtures(
> + [ServerFixture(server), make_zope_event_fixture(*event_handlers)])

Wouldn't it be cool to be able to just do "IFixture(server)" here? See
below.

> self.log.info('Starting branch scanning')
> branches = getUtility(IBranchScanner).getBranchesToScan()
> run_with_fixture(fixture, self.scanBranches, branches)
>
> === modified file 'lib/lp/codehosting/scanner/fixture.py'
> --- lib/lp/codehosting/scanner/fixture.py 2009-06-30 16:56:07 +0000
> +++ lib/lp/codehosting/scanner/fixture.py 2010-02-01 05:13:16 +0000
> @@ -1,4 +1,4 @@
> -# Copyright 2009 Canonical Ltd. This software is licensed under the
> +# Copyright 2009, 2010 Canonical Ltd. This software is licensed under the
> # GNU Affero General Public License version 3 (see the file LICENSE).
>
> # pylint: disable-msg=E0211
> @@ -16,6 +16,7 @@
> 'IFixture',
> 'make_zope_event_fixture',
> 'run_with_fixture',
> + 'ServerFixture',
> 'with_fixture',
> ]
>
> @@ -121,3 +122,18 @@
>
> def make_zope_event_fixture(*handlers):
> return Fixtures(map(ZopeEventHandlerFixture, handlers))
> +
> +
> +class ServerFixture:
> + """Adapt a bzrlib `Server` into an `IFixture`."""
> +
> + implements(IFixture)

adapts(...)

Maybe this could be registered as a real adapter? But I am not sure if
there is an interface available that could be adapted.

> +
> + def __init__(self, server):
> + self.server = server
> +
> + def setUp(self):
> + self.server.start_server()
> +
> + def tearDown(self):
> + self.server.stop_server()
>

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAktmxtgACgkQBT3oW1L17iiaIACgv/EpHTRVrmy...

review: Approve (code)

=== modified file 'bzrplugins/lpserve.py'
--- bzrplugins/lpserve.py	2009-07-17 00:26:05 +0000
+++ bzrplugins/lpserve.py	2010-02-04 00:33:17 +0000
@@ -92,7 +92,7 @@
         lp_server = get_lp_server(
             int(user_id), branchfs_endpoint_url,
             upload_directory, mirror_directory)
-        lp_server.setUp()
+        lp_server.start_server()
 
         old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
         try:
@@ -102,7 +102,7 @@
             self.run_server(smart_server)
         finally:
             lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
-            lp_server.tearDown()
+            lp_server.stop_server()
 
 
 register_command(cmd_launchpad_server)
 
=== modified file 'cronscripts/mpcreationjobs.py'
--- cronscripts/mpcreationjobs.py	2009-10-13 14:38:07 +0000
+++ cronscripts/mpcreationjobs.py	2010-02-04 00:33:17 +0000
@@ -33,11 +33,11 @@
         job_source = getUtility(IMergeProposalCreatedJobSource)
         runner = JobRunner.fromReady(job_source, self.logger)
         server = get_scanner_server()
-        server.setUp()
+        server.start_server()
         try:
             runner.runAll()
         finally:
-            server.tearDown()
+            server.stop_server()
         self.logger.info(
             'Ran %d MergeProposalCreatedJobs.', len(runner.completed_jobs))
 
 
=== modified file 'cronscripts/rosetta-branches.py'
--- cronscripts/rosetta-branches.py	2009-10-13 14:38:07 +0000
+++ cronscripts/rosetta-branches.py	2010-02-04 00:33:17 +0000
@@ -32,11 +32,11 @@
         runner = JobRunner.fromReady(
             getUtility(IRosettaUploadJobSource), self.logger)
         server = get_scanner_server()
-        server.setUp()
+        server.start_server()
         try:
             runner.runAll()
         finally:
-            server.tearDown()
+            server.stop_server()
         self.logger.info('Ran %d RosettaBranchJobs.',
                          len(runner.completed_jobs))
 
 
=== modified file 'cronscripts/sendbranchmail.py'
--- cronscripts/sendbranchmail.py	2009-10-13 14:38:07 +0000
+++ cronscripts/sendbranchmail.py	2010-02-04 00:33:17 +0000
@@ -33,11 +33,11 @@
         jobs.extend(getUtility(IRevisionsAddedJobSource).iterReady())
         runner = JobRunner(jobs, self.logger)
         server = get_scanner_server()
-        server.setUp()
+        server.start_server()
         try:
             runner.runAll()
         finally:
-            server.tearDown()
+            server.stop_server()
         self.logger.info(
             'Ran %d RevisionMailJobs.' % len(runner.completed_jobs))
 
 
=== modified file 'lib/canonical/launchpad/webapp/tests/test_errorlog.py'
--- lib/canonical/launchpad/webapp/tests/test_errorlog.py	2009-11-26 16:06:55 +0000
+++ lib/canonical/launchpad/webapp/tests/test_errorlog.py	2010-02-04 00:33:17 +0000
@@ -581,6 +581,7 @@
         class UnprintableException(Exception):
             def __str__(self):
                 raise RuntimeError('arrgh')
+            __repr__ = __str__
 
         log = InstalledHandler('SiteError')
         try:
 
=== modified file 'lib/lp/code/mail/codehandler.py'
--- lib/lp/code/mail/codehandler.py	2009-12-07 02:57:22 +0000
+++ lib/lp/code/mail/codehandler.py	2010-02-04 00:33:17 +0000
@@ -491,7 +491,7 @@
 
         # Create the LP server as if the submitter was pushing a branch to LP.
         lp_server = get_lp_server(submitter.id)
-        lp_server.setUp()
+        lp_server.start_server()
         try:
             source_url = urljoin(lp_server.get_url(), db_source.unique_name)
             target_url = urljoin(lp_server.get_url(), db_target.unique_name)
@@ -512,7 +512,7 @@
                 db_source.requestMirror()
             return db_source
         finally:
-            lp_server.tearDown()
+            lp_server.stop_server()
 
     def _pullRevisionsFromMergeDirectiveIntoSourceBranch(self, md,
                                                          target_url,
 
=== modified file 'lib/lp/code/mail/tests/test_codehandler.py'
--- lib/lp/code/mail/tests/test_codehandler.py	2010-01-12 01:25:35 +0000
+++ lib/lp/code/mail/tests/test_codehandler.py	2010-02-04 00:33:17 +0000
@@ -850,8 +850,8 @@
         The client has write access to the branch.
         """
         lp_server = get_lp_server(db_branch.owner.id)
-        lp_server.setUp()
-        self.addCleanup(lp_server.tearDown)
+        lp_server.start_server()
+        self.addCleanup(lp_server.stop_server)
         branch_url = urljoin(lp_server.get_url(), db_branch.unique_name)
         return Branch.open(branch_url)
 
 
=== modified file 'lib/lp/code/model/branchjob.py'
--- lib/lp/code/model/branchjob.py	2010-02-03 11:17:12 +0000
+++ lib/lp/code/model/branchjob.py	2010-02-04 00:33:17 +0000
@@ -50,8 +50,7 @@
 from lp.code.model.revision import RevisionSet
 from lp.codehosting.scanner import buglinks, email, mergedetection
 from lp.codehosting.scanner.fixture import (
-    Fixtures, make_zope_event_fixture, run_with_fixture
-)
+    Fixtures, ServerFixture, make_zope_event_fixture)
 from lp.codehosting.scanner.bzrsync import (
     BzrSync, schedule_diff_updates, schedule_translation_upload
 )
@@ -299,7 +298,7 @@
             schedule_translation_upload,
             ]
         fixture = Fixtures(
-            [cls.server, make_zope_event_fixture(*event_handlers)])
+            [ServerFixture(cls.server), make_zope_event_fixture(*event_handlers)])
         fixture.setUp()
         yield
         fixture.tearDown()
@@ -329,9 +328,9 @@
         """See `IBranchUpgradeJobSource`."""
         errorlog.globalErrorUtility.configure('upgrade_branches')
         server = get_multi_server(write_hosted=True)
-        server.setUp()
+        server.start_server()
         yield
-        server.tearDown()
+        server.stop_server()
 
     def run(self):
         """See `IBranchUpgradeJob`."""
 
=== modified file 'lib/lp/code/model/branchmergeproposaljob.py'
--- lib/lp/code/model/branchmergeproposaljob.py	2010-02-01 20:49:35 +0000
+++ lib/lp/code/model/branchmergeproposaljob.py	2010-02-04 00:33:17 +0000
@@ -272,9 +272,9 @@
         """See `IUpdatePreviewDiffJobSource`."""
         errorlog.globalErrorUtility.configure('update_preview_diffs')
         server = get_scanner_server()
-        server.setUp()
+        server.start_server()
         yield
-        server.tearDown()
+        server.stop_server()
 
     def run(self):
         """See `IRunnableJob`"""
@@ -339,11 +339,11 @@
         setupInteraction(principal, email_addr)
 
         server = get_multi_server(write_hosted=True)
-        server.setUp()
+        server.start_server()
         try:
             return CodeHandler().processMergeProposal(message)
         finally:
-            server.tearDown()
+            server.stop_server()
 
     def getOopsRecipients(self):
         message = self.getMessage()
 
=== modified file 'lib/lp/code/model/directbranchcommit.py'
--- lib/lp/code/model/directbranchcommit.py	2009-11-18 13:26:03 +0000
+++ lib/lp/code/model/directbranchcommit.py	2010-02-04 00:33:17 +0000
@@ -56,12 +56,12 @@
         allows write access to lp-hosted:/// URLs:
 
         bzrserver = get_multi_server(write_hosted=True)
-        bzrserver.setUp()
+        bzrserver.start_server()
         try:
             branchcommit = DirectBranchCommit(branch)
             # ...
         finally:
-            bzrserver.tearDown()
+            bzrserver.stop_server()
 
         Or in tests, just call `useBzrBranches` before creating a
         `DirectBranchCommit`.
 
=== modified file 'lib/lp/codehosting/bzrutils.py'
--- lib/lp/codehosting/bzrutils.py	2009-12-22 23:50:27 +0000
+++ lib/lp/codehosting/bzrutils.py	2010-02-04 00:33:17 +0000
@@ -217,13 +217,13 @@
         """
         self.schemes = schemes
 
-    def setUp(self):
+    def start_server(self):
         """Prevent transports being created for specified schemes."""
         for scheme in self.schemes:
             register_transport(scheme, self._deny)
         self._is_set_up = True
 
-    def tearDown(self):
+    def stop_server(self):
         """Re-enable creation of transports for specified schemes."""
         if not self._is_set_up:
             return
 
=== modified file 'lib/lp/codehosting/codeimport/tests/servers.py'
--- lib/lp/codehosting/codeimport/tests/servers.py	2009-12-14 18:11:07 +0000
+++ lib/lp/codehosting/codeimport/tests/servers.py	2010-02-04 00:33:17 +0000
@@ -82,8 +82,8 @@
         else:
             return local_path_to_url(self.repository_path)
 
-    def setUp(self):
-        super(SubversionServer, self).setUp()
+    def start_server(self):
+        super(SubversionServer, self).start_server()
         self.createRepository(self.repository_path)
         if self._use_svn_serve:
             conf_path = os.path.join(
@@ -109,8 +109,8 @@
                 raise AssertionError(
                     "svnserve didn't start accepting connections")
 
-    def tearDown(self):
-        super(SubversionServer, self).tearDown()
+    def stop_server(self):
+        super(SubversionServer, self).stop_server()
         if self._use_svn_serve:
             os.kill(self._svnserve.pid, signal.SIGINT)
             self._svnserve.communicate()
@@ -186,9 +186,9 @@
             module=module_name, log="import", vendor="vendor",
             release=['release'], dir='.')
 
-    def setUp(self):
+    def start_server(self):
         # Initialize the repository.
-        super(CVSServer, self).setUp()
+        super(CVSServer, self).start_server()
         self._repository = self.createRepository(self._repository_path)
 
 
 
=== modified file 'lib/lp/codehosting/codeimport/tests/test_foreigntree.py'
--- lib/lp/codehosting/codeimport/tests/test_foreigntree.py	2009-06-25 04:06:00 +0000
+++ lib/lp/codehosting/codeimport/tests/test_foreigntree.py	2010-02-04 00:33:17 +0000
@@ -40,8 +40,8 @@
     def setUp(self):
         TestCaseWithTransport.setUp(self)
         svn_server = SubversionServer('repository_path')
-        svn_server.setUp()
-        self.addCleanup(svn_server.tearDown)
+        svn_server.start_server()
+        self.addCleanup(svn_server.stop_server)
         self.svn_branch_url = svn_server.makeBranch(
             'trunk', [('README', 'original')])
 
@@ -122,11 +122,11 @@
     def setUp(self):
         TestCaseWithTransport.setUp(self)
         self.cvs_server = CVSServer('repository_path')
-        self.cvs_server.setUp()
+        self.cvs_server.start_server()
         self.module_name = 'test_module'
         self.cvs_server.makeModule(
             self.module_name, [('README', 'Random content\n')])
-        self.addCleanup(self.cvs_server.tearDown)
+        self.addCleanup(self.cvs_server.stop_server)
 
     def test_path(self):
         # The local path is passed to the constructor and available as
 
=== modified file 'lib/lp/codehosting/codeimport/tests/test_worker.py'
--- lib/lp/codehosting/codeimport/tests/test_worker.py	2010-02-01 03:55:59 +0000
+++ lib/lp/codehosting/codeimport/tests/test_worker.py	2010-02-04 00:33:17 +0000
@@ -773,8 +773,8 @@
         """Make a CVS `CodeImportSourceDetails` pointing at a real CVS repo.
         """
         cvs_server = CVSServer(self.makeTemporaryDirectory())
-        cvs_server.setUp()
-        self.addCleanup(cvs_server.tearDown)
+        cvs_server.start_server()
+        self.addCleanup(cvs_server.stop_server)
 
         cvs_server.makeModule('trunk', [('README', 'original\n')])
 
@@ -804,8 +804,8 @@
         """Make a SVN `CodeImportSourceDetails` pointing at a real SVN repo.
         """
         svn_server = SubversionServer(self.makeTemporaryDirectory())
-        svn_server.setUp()
-        self.addCleanup(svn_server.tearDown)
+        svn_server.start_server()
+        self.addCleanup(svn_server.stop_server)
 
         svn_branch_url = svn_server.makeBranch(branch_name, files)
         svn_branch_url = svn_branch_url.replace('://localhost/', ':///')
@@ -897,8 +897,8 @@
         """
         repository_path = self.makeTemporaryDirectory()
         git_server = GitServer(repository_path)
-        git_server.setUp()
-        self.addCleanup(git_server.tearDown)
+        git_server.start_server()
+        self.addCleanup(git_server.stop_server)
 
         git_server.makeRepo(files)
         self.foreign_commit_count = 1
@@ -948,8 +948,8 @@
         """
         repository_path = self.makeTemporaryDirectory()
         hg_server = MercurialServer(repository_path)
-        hg_server.setUp()
-        self.addCleanup(hg_server.tearDown)
+        hg_server.start_server()
+        self.addCleanup(hg_server.stop_server)
 
         hg_server.makeRepo(files)
         self.foreign_commit_count = 1
 
=== modified file 'lib/lp/codehosting/codeimport/tests/test_workermonitor.py'
--- lib/lp/codehosting/codeimport/tests/test_workermonitor.py	2010-02-01 03:49:23 +0000
+++ lib/lp/codehosting/codeimport/tests/test_workermonitor.py	2010-02-04 00:33:17 +0000
@@ -358,6 +358,9 @@
     """Tests for `CodeImportWorkerMonitor.run` that don't launch a subprocess.
     """
 
+    # This works around a clash between the TrialTestCase and the BzrTestCase.
+    skip = None
+
     class WorkerMonitor(CodeImportWorkerMonitor):
         """See `CodeImportWorkerMonitor`.
 
@@ -472,6 +475,9 @@
 
     layer = TwistedLaunchpadZopelessLayer
 
+    # This works around a clash between the TrialTestCase and the BzrTestCase.
+    skip = None
+
     def setUp(self):
         BzrTestCase.setUp(self)
         login('[e-mail]')
@@ -489,8 +495,8 @@
     def makeCVSCodeImport(self):
         """Make a `CodeImport` that points to a real CVS repository."""
         cvs_server = CVSServer(self.repo_path)
-        cvs_server.setUp()
-        self.addCleanup(cvs_server.tearDown)
+        cvs_server.start_server()
+        self.addCleanup(cvs_server.stop_server)
 
         cvs_server.makeModule('trunk', [('README', 'original\n')])
         self.foreign_commit_count = 2
@@ -501,8 +507,8 @@
     def makeSVNCodeImport(self):
         """Make a `CodeImport` that points to a real Subversion repository."""
         self.subversion_server = SubversionServer(self.repo_path)
-        self.subversion_server.setUp()
-        self.addCleanup(self.subversion_server.tearDown)
+        self.subversion_server.start_server()
+        self.addCleanup(self.subversion_server.stop_server)
         url = self.subversion_server.makeBranch(
             'trunk', [('README', 'contents')])
         self.foreign_commit_count = 2
@@ -513,8 +519,8 @@
         """Make a `CodeImport` that points to a real Subversion repository."""
         self.subversion_server = SubversionServer(
             self.repo_path, use_svn_serve=True)
-        self.subversion_server.setUp()
-        self.addCleanup(self.subversion_server.tearDown)
+        self.subversion_server.start_server()
+        self.addCleanup(self.subversion_server.stop_server)
         url = self.subversion_server.makeBranch(
             'trunk', [('README', 'contents')])
         self.foreign_commit_count = 2
@@ -526,8 +532,8 @@
         """Make a `CodeImport` that points to a real Git repository."""
         load_optional_plugin('git')
         self.git_server = GitServer(self.repo_path)
-        self.git_server.setUp()
-        self.addCleanup(self.git_server.tearDown)
+        self.git_server.start_server()
+        self.addCleanup(self.git_server.stop_server)
 
         self.git_server.makeRepo([('README', 'contents')])
         self.foreign_commit_count = 1
@@ -538,8 +544,8 @@
         """Make a `CodeImport` that points to a real Mercurial repository."""
         load_optional_plugin('hg')
         self.hg_server = MercurialServer(self.repo_path)
-        self.hg_server.setUp()
-        self.addCleanup(self.hg_server.tearDown)
+        self.hg_server.start_server()
+        self.addCleanup(self.hg_server.stop_server)
 
         self.hg_server.makeRepo([('README', 'contents')])
         self.foreign_commit_count = 1
 
=== modified file 'lib/lp/codehosting/puller/tests/test_acceptance.py'
--- lib/lp/codehosting/puller/tests/test_acceptance.py	2009-09-17 05:07:50 +0000
+++ lib/lp/codehosting/puller/tests/test_acceptance.py	2010-02-04 00:33:17 +0000
@@ -140,7 +140,7 @@
         """Serve the current directory over HTTP, returning the server URL."""
         http_server = HttpServer()
         http_server.port = port
-        http_server.setUp()
+        http_server.start_server()
         # Join cleanup added before the tearDown so the tearDown is executed
         # first as this tells the thread to die.  We then join explicitly as
         # the HttpServer.tearDown does not join.  There is a check in the
@@ -149,7 +149,7 @@
         # threads and let the garbage collector get them, however this causes
         # issues with the test runner.
         self.addCleanup(http_server._http_thread.join)
-        self.addCleanup(http_server.tearDown)
+        self.addCleanup(http_server.stop_server)
         return http_server.get_url().rstrip('/')
 
     def getLPServerForUser(self, user):
@@ -167,8 +167,8 @@
         # in a subprocess which would have no way of knowing which directories
         # to look in if we used freshly created temporary directories.
         lp_server = get_lp_server(user.id)
-        lp_server.setUp()
-        self.addCleanup(lp_server.tearDown)
+        lp_server.start_server()
+        self.addCleanup(lp_server.stop_server)
         return lp_server
 
     def openBranchAsUser(self, db_branch, user):
 
=== modified file 'lib/lp/codehosting/puller/tests/test_worker.py'
--- lib/lp/codehosting/puller/tests/test_worker.py	2010-01-07 06:40:23 +0000
+++ lib/lp/codehosting/puller/tests/test_worker.py	2010-02-04 00:33:17 +0000
@@ -34,7 +34,6 @@
 from lp.testing import TestCase
 from lp.testing.factory import LaunchpadObjectFactory
 from lazr.uri import URI
-from canonical.testing import reset_logging
 
 
 def get_netstrings(line):
@@ -737,13 +736,12 @@
     def tearDown(self):
         TestCaseWithTransport.tearDown(self)
         bzrlib.ui.ui_factory = self.saved_factory
-        reset_logging()
 
     def getHttpServerForCwd(self):
         """Get an `HttpServer` instance that serves from '.'."""
         server = HttpServer()
-        server.setUp()
-        self.addCleanup(server.tearDown)
+        server.start_server()
+        self.addCleanup(server.stop_server)
         # The gc.collect allows the threads behind any HTTP requests to exit.
         self.addCleanup(gc.collect)
         return server
 
=== modified file 'lib/lp/codehosting/puller/tests/test_worker_formats.py'
--- lib/lp/codehosting/puller/tests/test_worker_formats.py	2009-12-22 23:52:00 +0000
+++ lib/lp/codehosting/puller/tests/test_worker_formats.py	2010-02-04 00:33:17 +0000
@@ -17,7 +17,6 @@
 from lp.codehosting.puller.tests import PullerWorkerMixin
 from lp.codehosting.tests.helpers import LoomTestMixin
 from lazr.uri import URI
-from canonical.testing import reset_logging
 
 
 class TestPullerWorkerFormats(TestCaseWithRepository, PullerWorkerMixin,
@@ -31,10 +30,6 @@
             self.get_url(self._source_branch_path),
             self.get_url('dest-path'))
 
-    def tearDown(self):
-        TestCaseWithRepository.tearDown(self)
-        reset_logging()
-
     def _createSourceBranch(self, repository_format, bzrdir_format,
                             branch_format=None):
         """Make a source branch with the given formats."""
 
=== modified file 'lib/lp/codehosting/puller/worker.py'
--- lib/lp/codehosting/puller/worker.py	2010-01-07 05:04:49 +0000
+++ lib/lp/codehosting/puller/worker.py	2010-02-04 00:33:17 +0000
@@ -419,12 +419,12 @@
         from lp.codehosting.vfs import get_puller_server
 
         server = get_puller_server()
-        server.setUp()
+        server.start_server()
         try:
             source_branch = self.branch_mirrorer.open(self.source)
             return self.branch_mirrorer.mirror(source_branch, self.dest)
         finally:
-            server.tearDown()
+            server.stop_server()
 
     def mirror(self):
         """Open source and destination branches and pull source into
 
=== modified file 'lib/lp/codehosting/scanner/branch_scanner.py'
--- lib/lp/codehosting/scanner/branch_scanner.py	2009-12-17 02:00:16 +0000
+++ lib/lp/codehosting/scanner/branch_scanner.py	2010-02-04 00:33:17 +0000
@@ -23,7 +23,7 @@
 from lp.codehosting.scanner.bzrsync import (
     BzrSync, schedule_diff_updates, schedule_translation_upload)
 from lp.codehosting.scanner.fixture import (
-    Fixtures, make_zope_event_fixture, run_with_fixture)
+    Fixtures, make_zope_event_fixture, run_with_fixture, ServerFixture)
 from canonical.launchpad.webapp import canonical_url, errorlog
 
 
@@ -100,7 +100,8 @@
             schedule_translation_upload,
             ]
         server = get_scanner_server()
-        fixture = Fixtures([server, make_zope_event_fixture(*event_handlers)])
+        fixture = Fixtures(
+            [ServerFixture(server), make_zope_event_fixture(*event_handlers)])
         self.log.info('Starting branch scanning')
         branches = getUtility(IBranchScanner).getBranchesToScan()
         run_with_fixture(fixture, self.scanBranches, branches)
 
=== modified file 'lib/lp/codehosting/scanner/fixture.py'
--- lib/lp/codehosting/scanner/fixture.py	2009-06-30 16:56:07 +0000
+++ lib/lp/codehosting/scanner/fixture.py	2010-02-04 00:33:17 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009, 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 # pylint: disable-msg=E0211
@@ -16,6 +16,7 @@
     'IFixture',
     'make_zope_event_fixture',
     'run_with_fixture',
+    'ServerFixture',
     'with_fixture',
     ]
 
@@ -121,3 +122,18 @@
 
 def make_zope_event_fixture(*handlers):
     return Fixtures(map(ZopeEventHandlerFixture, handlers))
+
+
+class ServerFixture:
+    """Adapt a bzrlib `Server` into an `IFixture`."""
+
+    implements(IFixture)
+
+    def __init__(self, server):
+        self.server = server
+
+    def setUp(self):
+        self.server.start_server()
+
+    def tearDown(self):
+        self.server.stop_server()
 
=== modified file 'lib/lp/codehosting/scanner/tests/test_bzrsync.py'
--- lib/lp/codehosting/scanner/tests/test_bzrsync.py	2010-01-06 09:26:56 +0000
+++ lib/lp/codehosting/scanner/tests/test_bzrsync.py	2010-02-04 00:33:17 +0000
@@ -73,7 +73,7 @@
         self._url_prefix = url_prefix
         self._chroot_server = None
 
-    def setUp(self):
+    def start_server(self):
         """Activate the transport URL."""
         # The scanner tests assume that branches live on a Launchpad virtual
         # filesystem rooted at 'lp-mirrored:///'. Rather than provide the
@@ -81,11 +81,11 @@
         # transport do the work.
         register_transport(self._url_prefix, self._transportFactory)
         self._chroot_server = ChrootServer(self._transport)
-        self._chroot_server.setUp()
+        self._chroot_server.start_server()
 
-    def tearDown(self):
+    def stop_server(self):
         """Deactivate the transport URL."""
-        self._chroot_server.tearDown()
+        self._chroot_server.stop_server()
         unregister_transport(self._url_prefix, self._transportFactory)
 
     def _transportFactory(self, url):
@@ -111,8 +111,8 @@
         # Here we set up a fake so that we can test without worrying about
         # authservers and the like.
         server = FakeTransportServer(self.get_transport())
-        server.setUp()
-        self.addCleanup(server.tearDown)
+        server.start_server()
+        self.addCleanup(server.stop_server)
 
     def makeFixtures(self):
         """Makes test fixtures before we switch to the scanner db user."""
 
=== modified file 'lib/lp/codehosting/sftp.py'
--- lib/lp/codehosting/sftp.py	2009-11-27 21:59:26 +0000
+++ lib/lp/codehosting/sftp.py	2010-02-04 00:33:17 +0000
@@ -251,7 +251,7 @@
         config.codehosting.mirrored_branches_root)
     server = LaunchpadServer(
         avatar.branchfs_proxy, user_id, hosted_transport, mirror_transport)
-    server.setUp()
+    server.start_server()
     transport = AsyncLaunchpadTransport(server, server.get_url())
     notify(accesslog.SFTPStarted(avatar))
     return TransportSFTPServer(transport)
 
=== modified file 'lib/lp/codehosting/sshserver/tests/test_logging.py'
--- lib/lp/codehosting/sshserver/tests/test_logging.py	2009-06-25 04:06:00 +0000
+++ lib/lp/codehosting/sshserver/tests/test_logging.py	2010-02-04 00:33:17 +0000
@@ -24,7 +24,6 @@
 from canonical.config import config
 from canonical.launchpad.scripts import WatchedFileHandler
 from lp.testing import TestCase
-from canonical.testing import reset_logging
 
 
 class TestLoggingBazaarInteraction(BzrTestCase):
@@ -36,16 +35,6 @@
         self._real_stderr = sys.stderr
         sys.stderr = codecs.getwriter('utf8')(StringIO())
 
-        # We want to use Bazaar's default logging -- not its test logging --
-        # so here we disable the testing logging system (which restores
-        # default logging).
-        self._finishLogFile()
-
-        # We don't use BaseLayer because we want to keep the amount of
-        # pre-configured logging systems to an absolute minimum, in order to
-        # make it easier to test this particular logging system.
-        self.addCleanup(reset_logging)
-
     def tearDown(self):
         sys.stderr = self._real_stderr
         BzrTestCase.tearDown(self)
@@ -77,13 +66,6 @@
 
 class TestLoggingManager(TestCase):
 
-    def setUp(self):
-        TestCase.setUp(self)
-        # We don't use BaseLayer because we want to keep the amount of
-        # pre-configured logging systems to an absolute minimum, in order to
-        # make it easier to test this particular logging system.
-        self.addCleanup(reset_logging)
-
     def test_returns_codehosting_logger(self):
         # get_codehosting_logger returns the 'codehosting' logger.
         self.assertIs(
 
=== modified file 'lib/lp/codehosting/tests/servers.py'
--- lib/lp/codehosting/tests/servers.py	2009-06-25 04:06:00 +0000
+++ lib/lp/codehosting/tests/servers.py	2010-02-04 00:33:17 +0000
@@ -126,10 +126,10 @@
         transport = get_transport(self.get_url()).clone(path)
         return transport
 
-    def setUp(self):
+    def start_server(self):
         self._real_home, self._fake_home = self.setUpFakeHome()
 
-    def tearDown(self):
+    def stop_server(self):
         os.environ['HOME'] = self._real_home
         shutil.rmtree(self._fake_home)
 
 
=== modified file 'lib/lp/codehosting/tests/test_acceptance.py'
--- lib/lp/codehosting/tests/test_acceptance.py	2009-12-22 23:45:50 +0000
+++ lib/lp/codehosting/tests/test_acceptance.py	2010-02-04 00:33:17 +0000
@@ -89,15 +89,15 @@
         self.disable_directory_isolation()
         tac_handler = SSHServerLayer.getTacHandler()
         self.server = SSHCodeHostingServer(self.scheme, tac_handler)
-        self.server.setUp()
-        self.addCleanup(self.server.tearDown)
+        self.server.start_server()
+        self.addCleanup(self.server.stop_server)
 
         # Prevent creation of in-process sftp:// and bzr+ssh:// transports --
         # such connections tend to leak threads and occasionally create
         # uncollectable garbage.
         ssh_denier = DenyingServer(['bzr+ssh://', 'sftp://'])
-        ssh_denier.setUp()
-        self.addCleanup(ssh_denier.tearDown)
+        ssh_denier.start_server()
+        self.addCleanup(ssh_denier.stop_server)
 
         # Create a local branch with one revision
         tree = self.make_branch_and_tree('.')
 
=== modified file 'lib/lp/codehosting/tests/test_branchdistro.py'
--- lib/lp/codehosting/tests/test_branchdistro.py	2009-10-26 22:37:15 +0000
+++ lib/lp/codehosting/tests/test_branchdistro.py	2010-02-04 00:33:17 +0000
@@ -59,8 +59,8 @@
         # location.
 
         chroot_server = ChrootServer(self.get_transport())
-        chroot_server.setUp()
-        self.addCleanup(chroot_server.tearDown)
+        chroot_server.start_server()
+        self.addCleanup(chroot_server.stop_server)
         scheme = chroot_server.get_url().rstrip('/:')
 
         old_branch = FakeBranch(1)
 
=== modified file 'lib/lp/codehosting/tests/test_bzrutils.py'
--- lib/lp/codehosting/tests/test_bzrutils.py	2009-12-22 23:52:00 +0000
+++ lib/lp/codehosting/tests/test_bzrutils.py	2010-02-04 00:33:17 +0000
@@ -127,9 +127,9 @@
             branch.base.startswith('file://'),
             "make_branch() didn't make branch with file:// URL")
         file_denier = DenyingServer(['file://'])
-        file_denier.setUp()
+        file_denier.start_server()
         self.assertRaises(AssertionError, Branch.open, branch.base)
-        file_denier.tearDown()
+        file_denier.stop_server()
         # This is just "assertNotRaises":
         Branch.open(branch.base)
 
@@ -188,8 +188,8 @@
         # RemoteBranch.
         vfs_branch = self.make_branch('.')
         smart_server = server.SmartTCPServer_for_testing()
-        smart_server.setUp(self.get_vfs_only_server())
-        self.addCleanup(smart_server.tearDown)
+        smart_server.start_server(self.get_vfs_only_server())
+        self.addCleanup(smart_server.stop_server)
         remote_branch = Branch.open(smart_server.get_url())
         # Check that our set up worked: remote_branch is Remote and
         # source_branch is not.
 
=== modified file 'lib/lp/codehosting/tests/test_sftp.py'
--- lib/lp/codehosting/tests/test_sftp.py	2009-12-08 16:24:12 +0000
+++ lib/lp/codehosting/tests/test_sftp.py	2010-02-04 00:33:17 +0000
@@ -161,6 +161,9 @@
 
     layer = TwistedLayer
 
+    # This works around a clash between the TrialTestCase and the BzrTestCase.
+    skip = None
+
     def setUp(self):
         TrialTestCase.setUp(self)
         TestCaseInTempDir.setUp(self)
@@ -413,6 +416,9 @@
 
     layer = TwistedLayer
 
+    # This works around a clash between the TrialTestCase and the BzrTestCase.
+    skip = None
+
     def setUp(self):
         TrialTestCase.setUp(self)
         TestCaseInTempDir.setUp(self)
 
=== modified file 'lib/lp/codehosting/vfs/branchfs.py'
--- lib/lp/codehosting/vfs/branchfs.py	2010-01-07 05:05:37 +0000
+++ lib/lp/codehosting/vfs/branchfs.py	2010-02-04 00:33:17 +0000
@@ -340,7 +340,7 @@
             configured to use the given default stacked-on location.
         """
         memory_server = MemoryServer()
-        memory_server.setUp()
+        memory_server.start_server()
         transport = get_transport(memory_server.get_url())
         if default_stack_on == '':
             return transport
@@ -378,7 +378,7 @@
         """
         AsyncVirtualServer.__init__(self, scheme)
         self._authserver = BranchFileSystemClient(authserver, user_id)
-        self._is_set_up = False
+        self._is_start_server = False
 
     def translateVirtualPath(self, virtual_url_fragment):
         """See `AsyncVirtualServer.translateVirtualPath`.
@@ -429,8 +429,8 @@
             scheme, authserver, LAUNCHPAD_SERVICES)
         self._transport_dispatch = BranchTransportDispatch(branch_transport)
 
-    def setUp(self):
-        super(LaunchpadInternalServer, self).setUp()
+    def start_server(self):
+        super(LaunchpadInternalServer, self).start_server()
         try:
             self._transport_dispatch.base_transport.ensure_base()
         except TransportNotPossible:
@@ -439,7 +439,7 @@
     def destroy(self):
         """Delete the on-disk branches and tear down."""
         self._transport_dispatch.base_transport.delete_tree('.')
-        self.tearDown()
+        self.stop_server()
 
 
 class DirectDatabaseLaunchpadServer(AsyncVirtualServer):
@@ -448,8 +448,8 @@
         AsyncVirtualServer.__init__(self, scheme)
         self._transport_dispatch = BranchTransportDispatch(branch_transport)
 
-    def setUp(self):
-        super(DirectDatabaseLaunchpadServer, self).setUp()
+    def start_server(self):
+        super(DirectDatabaseLaunchpadServer, self).start_server()
         try:
             self._transport_dispatch.base_transport.ensure_base()
         except TransportNotPossible:
@@ -458,7 +458,7 @@
     def destroy(self):
         """Delete the on-disk branches and tear down."""
         self._transport_dispatch.base_transport.delete_tree('.')
-        self.tearDown()
+        self.stop_server()
 
     def translateVirtualPath(self, virtual_url_fragment):
         """See `AsyncVirtualServer.translateVirtualPath`.
 
=== modified file 'lib/lp/codehosting/vfs/tests/test_branchfs.py'
--- lib/lp/codehosting/vfs/tests/test_branchfs.py	2009-12-22 23:50:27 +0000
+++ lib/lp/codehosting/vfs/tests/test_branchfs.py	2010-02-04 00:33:17 +0000
@@ -49,7 +49,7 @@
     def setUp(self):
         super(TestBranchTransportDispatch, self).setUp()
         memory_server = MemoryServer()
-        memory_server.setUp()
+        memory_server.start_server()
         self.base_transport = get_transport(memory_server.get_url())
         self.factory = BranchTransportDispatch(self.base_transport)
 
@@ -90,7 +90,7 @@
     def setUp(self):
         super(TestTransportDispatch, self).setUp()
         memory_server = MemoryServer()
-        memory_server.setUp()
+        memory_server.start_server()
         base_transport = get_transport(memory_server.get_url())
         base_transport.mkdir('hosted')
         base_transport.mkdir('mirrored')
@@ -199,16 +199,16 @@
     def test_setUp(self):
         # Setting up the server registers its schema with the protocol
         # handlers.
-        self.server.setUp()
-        self.addCleanup(self.server.tearDown)
+        self.server.start_server()
+        self.addCleanup(self.server.stop_server)
         self.assertTrue(
             self.server.get_url() in _get_protocol_handlers().keys())
 
     def test_tearDown(self):
         # Setting up then tearing down the server removes its schema from the
         # protocol handlers.
-        self.server.setUp()
-        self.server.tearDown()
+        self.server.start_server()
+        self.server.stop_server()
         self.assertFalse(
             self.server.get_url() in _get_protocol_handlers().keys())
 
@@ -216,6 +216,9 @@
 class TestLaunchpadServer(MixinBaseLaunchpadServerTests, TrialTestCase,
                           BzrTestCase):
 
+    # This works around a clash between the TrialTestCase and the BzrTestCase.
+    skip = None
+
     def setUp(self):
         BzrTestCase.setUp(self)
         MixinBaseLaunchpadServerTests.setUp(self)
@@ -287,8 +290,8 @@
         # The URL of the server is 'lp-<number>:///', where <number> is the
         # id() of the server object. Including the id allows for multiple
         # Launchpad servers to be running within a single process.
-        self.server.setUp()
-        self.addCleanup(self.server.tearDown)
+        self.server.start_server()
+        self.addCleanup(self.server.stop_server)
         self.assertEqual('lp-%d:///' % id(self.server), self.server.get_url())
 
 
@@ -315,8 +318,8 @@
         return deferred.addCallback(check_branch_transport)
 
     def test_translate_control_dir_path(self):
-        self.server.setUp()
-        self.addCleanup(self.server.tearDown)
+        self.server.start_server()
+        self.addCleanup(self.server.stop_server)
         branch = self.factory.makeProductBranch()
         branch.product.development_focus.branch = branch
         transport = get_transport(self.server.get_url())
@@ -327,8 +330,8 @@
     def test_open_containing_raises_branch_not_found(self):
         # open_containing_from_transport raises NotBranchError if there's no
         # branch at that URL.
-        self.server.setUp()
-        self.addCleanup(self.server.tearDown)
+        self.server.start_server()
+        self.addCleanup(self.server.stop_server)
         branch = self.factory.makeAnyBranch(owner=self.requester)
         transport = get_transport(self.server.get_url())
         transport = transport.clone(branch.unique_name)
@@ -342,6 +345,9 @@
                                   LaunchpadInternalServerTests):
     """Tests for `LaunchpadInternalServer`, used by the puller and scanner."""
 
+    # This works around a clash between the TrialTestCase and the BzrTestCase.
+    skip = None
+
     def setUp(self):
         BzrTestCase.setUp(self)
         self.disable_directory_isolation()
@@ -358,6 +364,9 @@
 
     layer = ZopelessDatabaseLayer
 
+    # This works around a clash between the TrialTestCase and the BzrTestCase.
+    skip = None
+
     def setUp(self):
         super(TestDirectDatabaseLaunchpadServer, self).setUp()
         self.requester = self.factory.makePerson()
@@ -371,6 +380,9 @@
 
     layer = TwistedLayer
 
+    # This works around a clash between the TrialTestCase and the BzrTestCase.
+    skip = None
+
     class VirtualServer(Server):
         """Very simple server that provides a AsyncVirtualTransport."""
 
@@ -383,11 +395,11 @@
         def get_url(self):
             return self.scheme
 
-        def setUp(self):
+        def start_server(self):
             self.scheme = 'virtual:///'
             register_transport(self.scheme, self._transportFactory)
 
-        def tearDown(self):
+        def stop_server(self):
             unregister_transport(self.scheme, self._transportFactory)
 
         def translateVirtualPath(self, virtual_path):
@@ -399,8 +411,8 @@
         TestCaseInTempDir.setUp(self)
         self.server = self.VirtualServer(
             FatLocalTransport(local_path_to_url('.')))
-        self.server.setUp()
-        self.addCleanup(self.server.tearDown)
+        self.server.start_server()
+        self.addCleanup(self.server.stop_server)
         self.transport = get_transport(self.server.get_url())
 
     def test_writeChunk(self):
@@ -477,8 +489,8 @@
         self.server = self.getServer(
             authserver, self.requester.id, self.backing_transport,
             MemoryTransport())
-        self.server.setUp()
-        self.addCleanup(self.server.tearDown)
+        self.server.start_server()
+        self.addCleanup(self.server.stop_server)
 
     def assertFiresFailure(self, exception, function, *args, **kwargs):
         """Assert that calling `function` will cause `exception` to be fired.
@@ -770,6 +782,9 @@
 
 class TestLaunchpadTransportSync(LaunchpadTransportTests, TrialTestCase):
 
+    # This works around a clash between the TrialTestCase and the BzrTestCase.
+    skip = None
+
     def _ensureDeferred(self, function, *args, **kwargs):
         def call_function_and_check_not_deferred():
             ret = function(*args, **kwargs)
@@ -793,6 +808,9 @@
 
 class TestLaunchpadTransportAsync(LaunchpadTransportTests, TrialTestCase):
 
+    # This works around a clash between the TrialTestCase and the BzrTestCase.
+    skip = None
+
     def _ensureDeferred(self, function, *args, **kwargs):
         deferred = function(*args, **kwargs)
         self.assertIsInstance(deferred, defer.Deferred)
@@ -828,8 +846,8 @@
             self._server = LaunchpadServer(
                 XMLRPCWrapper(self.authserver), self.requester.id,
                 self.backing_transport, self.mirror_transport)
-            self._server.setUp()
-            self.addCleanup(self._server.tearDown)
+            self._server.start_server()
+            self.addCleanup(self._server.stop_server)
         return self._server
 
     def test_no_mirrors_requested_if_no_branches_changed(self):
@@ -861,6 +879,9 @@
     # See comment on TestLaunchpadServer.
     layer = TwistedLayer
 
+    # This works around a clash between the TrialTestCase and the BzrTestCase.
+    skip = None
+
     def setUp(self):
         BzrTestCase.setUp(self)
 
@@ -890,8 +911,8 @@
 
     def _setUpMemoryServer(self):
         memory_server = MemoryServer()
-        memory_server.setUp()
-        self.addCleanup(memory_server.tearDown)
+        memory_server.start_server()
+        self.addCleanup(memory_server.stop_server)
         return memory_server
 
     def _setUpLaunchpadServer(self, user_id, authserver, backing_transport,
@@ -899,8 +920,8 @@
         server = LaunchpadServer(
             XMLRPCWrapper(authserver), user_id, backing_transport,
             mirror_transport)
-        server.setUp()
-        self.addCleanup(server.tearDown)
+        server.start_server()
+        self.addCleanup(server.stop_server)
         return server
 
     def test_mkdir_readonly(self):
 
=== modified file 'lib/lp/codehosting/vfs/tests/test_filesystem.py'
--- lib/lp/codehosting/vfs/tests/test_filesystem.py	2009-11-21 00:34:12 +0000
+++ lib/lp/codehosting/vfs/tests/test_filesystem.py	2010-02-04 00:33:17 +0000
@@ -34,8 +34,8 @@
         self.requester = self.factory.makePerson()
         self._server = LaunchpadServer(
             endpoint, self.requester.id, MemoryTransport(), MemoryTransport())
-        self._server.setUp()
-        self.addCleanup(self._server.tearDown)
+        self._server.start_server()
+        self.addCleanup(self._server.stop_server)
 
     def getTransport(self, relpath=None):
         return get_transport(self._server.get_url()).clone(relpath)
 
=== modified file 'lib/lp/codehosting/vfs/tests/test_transport.py'
--- lib/lp/codehosting/vfs/tests/test_transport.py	2009-12-22 23:52:00 +0000
+++ lib/lp/codehosting/vfs/tests/test_transport.py	2010-02-04 00:33:17 +0000
@@ -60,7 +60,7 @@
             self._branch_path).clone('.bzr')
         bzrdir_transport.ensure_base()
         chroot_server = chroot.ChrootServer(bzrdir_transport)
-        chroot_server.setUp()
+        chroot_server.start_server()
         self._chroot_servers.append(chroot_server)
         return get_transport(chroot_server.get_url()).clone(relpath)
 
@@ -71,7 +71,7 @@
         ChrootServer instances we've set up.
         """
         for chroot_server in self._chroot_servers:
-            chroot_server.tearDown()
+            chroot_server.stop_server()
         LaunchpadInternalServer.tearDown(self)
 
 
 
=== modified file 'lib/lp/codehosting/vfs/transport.py'
--- lib/lp/codehosting/vfs/transport.py	2009-12-22 23:50:27 +0000
+++ lib/lp/codehosting/vfs/transport.py	2010-02-04 00:33:17 +0000
@@ -57,7 +57,7 @@
     if mkdir:
         transport.create_prefix()
     chroot_server = chroot.ChrootServer(transport)
-    chroot_server.setUp()
+    chroot_server.start_server()
     return get_transport(chroot_server.get_url())
 
 
@@ -74,17 +74,17 @@
     def __init__(self, *servers):
         self._servers = servers
 
-    def setUp(self):
+    def start_server(self):
         for server in self._servers:
-            server.setUp()
+            server.start_server()
 
     def destroy(self):
         for server in reversed(self._servers):
             server.destroy()
 
-    def tearDown(self):
+    def stop_server(self):
         for server in reversed(self._servers):
-            server.tearDown()
+            server.stop_server()
 
 
 class AsyncVirtualTransport(Transport):
@@ -383,7 +383,7 @@
         # safely upcall it.
         # pylint: disable-msg=W0231
         self._scheme = scheme
-        self._is_set_up = False
+        self._is_started = False
 
     def _transportFactory(self, url):
         """Create a transport for this server pointing at `url`.
@@ -412,14 +412,14 @@
         """Return the URL of this server."""
         return self._scheme
 
-    def setUp(self):
-        """See Server.setUp."""
+    def start_server(self):
+        """See Server.start_server."""
         register_transport(self.get_url(), self._transportFactory)
-        self._is_set_up = True
+        self._is_started = True
 
-    def tearDown(self):
-        """See Server.tearDown."""
-        if not self._is_set_up:
+    def stop_server(self):
+        """See Server.stop_server."""
+        if not self._is_started:
             return
-        self._is_set_up = False
+        self._is_started = False
         unregister_transport(self.get_url(), self._transportFactory)
 
=== modified file 'lib/lp/testing/__init__.py'
--- lib/lp/testing/__init__.py	2010-02-02 11:26:31 +0000
+++ lib/lp/testing/__init__.py	2010-02-04 00:33:17 +0000
@@ -524,18 +524,39 @@
             server = get_multi_server(
                 write_hosted=True, write_mirrored=True,
                 direct_database=direct_database)
-            server.setUp()
+            server.start_server()
             self.addCleanup(server.destroy)
         else:
             os.mkdir('lp-mirrored')
             mirror_server = FakeTransportServer(get_transport('lp-mirrored'))
-            mirror_server.setUp()
-            self.addCleanup(mirror_server.tearDown)
+            mirror_server.start_server()
+            self.addCleanup(mirror_server.stop_server)
             os.mkdir('lp-hosted')
             hosted_server = FakeTransportServer(
                 get_transport('lp-hosted'), url_prefix='lp-hosted:///')
-            hosted_server.setUp()
-            self.addCleanup(hosted_server.tearDown)
+            hosted_server.start_server()
+            self.addCleanup(hosted_server.stop_server)
+
+
+class WindmillTestCase(TestCaseWithFactory):
+    """A TestCase class for Windmill tests.
+
+    It provides a WindmillTestClient (self.client) with Launchpad's front
+    page loaded.
+    """
+
+    suite_name = ''
+
+    def setUp(self):
+        TestCaseWithFactory.setUp(self)
+        self.client = WindmillTestClient(self.suite_name)
+        # Load the front page to make sure we don't get fooled by stale pages
+        # left by the previous test. (For some reason, when you create a new
+        # WindmillTestClient you get a new session and everything, but if you
+        # do anything before you open() something you'd be operating on the
+        # page that was last accessed by the previous test, which is the cause
+        # of things like https://launchpad.net/bugs/515494)
+        self.client.open(url=u'http://launchpad.dev:8085')
 
 
 class WindmillTestCase(TestCaseWithFactory):
 
=== modified file 'lib/lp/translations/scripts/translations_to_branch.py'
--- lib/lp/translations/scripts/translations_to_branch.py	2010-01-10 04:29:39 +0000
+++ lib/lp/translations/scripts/translations_to_branch.py	2010-02-04 00:33:17 +0000
@@ -274,8 +274,8 @@
         productseries = productseries.order_by(ProductSeries.id)
 
         bzrserver = get_multi_server(write_hosted=True)
-        bzrserver.setUp()
+        bzrserver.start_server()
         try:
             self._exportToBranches(productseries)
         finally:
-            bzrserver.tearDown()
+            bzrserver.stop_server()
 
=== modified file 'scripts/branch-distro.py'
--- scripts/branch-distro.py	2009-10-23 16:15:35 +0000
+++ scripts/branch-distro.py	2010-02-04 00:33:17 +0000
@@ -26,7 +26,7 @@
         brancher = DistroBrancher.fromNames(self.logger, *self.args)
         server = get_multi_server(
             write_mirrored=True, write_hosted=True, direct_database=True)
-        server.setUp()
+        server.start_server()
         try:
             if self.options.check:
                 if not brancher.checkNewBranches():
@@ -34,7 +34,7 @@
             else:
                 brancher.makeNewBranches()
         finally:
-            server.tearDown()
+            server.stop_server()
 
 if __name__ == '__main__':
     BranchDistroScript("branch-distro", dbuser='branch-distro').run()
 
=== modified file 'scripts/update-stacked-on.py'
--- scripts/update-stacked-on.py	2009-10-13 14:38:07 +0000
+++ scripts/update-stacked-on.py	2010-02-04 00:33:17 +0000
@@ -94,14 +94,14 @@
 
     def main(self):
         server = get_server(self.options.dry_run)
-        server.setUp()
+        server.start_server()
         if self.options.dry_run:
             self.logger.debug('Running read-only')
         self.logger.debug('Beginning processing')
         try:
             self.updateBranches(self.parseFromStream(sys.stdin))
         finally:
-            server.tearDown()
+            server.stop_server()
         self.logger.info('Done')
 
     def updateStackedOn(self, branch_id, bzr_branch_url, stacked_on_location):
 
=== modified file 'versions.cfg'
--- versions.cfg	2010-02-03 22:43:51 +0000
+++ versions.cfg	2010-02-04 00:33:17 +0000
@@ -5,8 +5,8 @@
 # Alphabetical, case-insensitive, please! :-)
 
 ampoule = 0.2.0
-# Non-released bzr version from bzr+ssh://bazaar.launchpad.net/~mwhudson/bzr/2.1.0b4-lp2
-bzr = 2.1b4-lp2
+# From lp:~mwhudson/bzr/bzr-2.1.0rc2-lp-1 ('make dist' from r4807)
+bzr = 2.1.0rc2-lp-1
 chameleon.core = 1.0b35
 chameleon.zpt = 1.0b17
 ClientForm = 0.2.10