Rev 4681: Fix test base class in http://bazaar.launchpad.net/~vila/bzr/integration

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/integration

------------------------------------------------------------
revno: 4681
revision-id: v.ladeuil+lp at free.fr-20090909143929-152hxzlxiz879as3
parent: v.ladeuil+lp at free.fr-20090908154106-5krckvfkhj0y9spe
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: integration
timestamp: Wed 2009-09-09 16:39:29 +0200
message:
  Fix test base class
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_merge.py'
--- a/bzrlib/tests/blackbox/test_merge.py	2009-09-08 15:39:36 +0000
+++ b/bzrlib/tests/blackbox/test_merge.py	2009-09-09 14:39:29 +0000
@@ -589,7 +589,7 @@
         self.failUnlessExists('this/other_file')
 
 
-class TestMergeForce(TestMerge):
+class TestMergeForce(tests.TestCaseWithTransport):
 
     def test_merge_force(self):
         tree_a = self.make_branch_and_tree('a')