Merge lp:~mwhudson/launchpad/unregister-bzr-git into lp:launchpad

[Michael Hudson-Doyle]

Unregister bzr-git rather than using a layer that cannot be torn down

Hi,

A little while ago Rob hacked the bzr-git plugin to be deregisterable, so let's use that and avoid having to use a layer that can't be torn down to avoid bzr-git's being loaded causing other tests to fail.

Cheers,
mwh

[Tim Penhey (thumper)]

Looks like a positive change.

review: Approve

[lp:~mwhudson/launchpad/unregister-bzr-git]

10392. By Michael Hudson-Doyle on 2010-04-28

merge devel

[Michael Hudson-Doyle (mwhudson)]

Tests are failing in this, although I completely forget the details.

Unmerged revisions

10392. By Michael Hudson-Doyle on 2010-04-28

merge devel

10391. By Michael Hudson-Doyle on 2010-04-28

merge trunk

10390. By Michael Hudson-Doyle on 2010-02-24

deregister bzr-git in teardown

10389. By Michael Hudson-Doyle on 2010-02-24

use rob's branch

10388. By Michael Hudson-Doyle on 2010-02-24

revert ForeignBranchPluginLayer hack

=== modified file 'lib/lp/codehosting/codeimport/tests/test_worker.py'
--- lib/lp/codehosting/codeimport/tests/test_worker.py	2010-04-12 01:16:16 +0000
+++ lib/lp/codehosting/codeimport/tests/test_worker.py	2010-04-28 21:17:33 +0000
@@ -42,30 +42,6 @@
 import pysvn
 
 
-class ForeignBranchPluginLayer(BaseLayer):
-    """Ensure only specific tests are run with foreign branch plugins loaded.
-    """
-
-    @classmethod
-    def setUp(cls):
-        pass
-
-    @classmethod
-    def tearDown(cls):
-        # Raise NotImplementedError to signal that this layer cannot be torn
-        # down.  This means that the test runner will run subsequent tests in
-        # a different process.
-        raise NotImplementedError
-
-    @classmethod
-    def testSetUp(cls):
-        pass
-
-    @classmethod
-    def testTearDown(cls):
-        pass
-
-
 default_format = BzrDirFormat.get_default_format()
 
 
@@ -76,7 +52,7 @@
     factories for some code import objects.
     """
 
-    layer = ForeignBranchPluginLayer
+    layer = BaseLayer
 
     def setUp(self):
         TestCaseWithTransport.setUp(self)
@@ -1002,6 +978,8 @@
         """
         from bzrlib.plugins.git.shamap import mapdbs
         mapdbs().clear()
+        from bzrlib.plugins.git import deregister
+        deregister()
         WorkerTest.tearDown(self)
 
     def makeImportWorker(self, source_details):