Rev 4618: Fix imports in bzrlib/tests/blackbox/test_conflicts.py. in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4618
revision-id: v.ladeuil+lp at free.fr-20091016125947-smnlc9zxf58uf2r9
parent: v.ladeuil+lp at free.fr-20091016125442-hq73l9xr2v9io27i
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: description
timestamp: Fri 2009-10-16 14:59:47 +0200
message:
  Fix imports in bzrlib/tests/blackbox/test_conflicts.py.
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_conflicts.py'
--- a/bzrlib/tests/blackbox/test_conflicts.py	2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/blackbox/test_conflicts.py	2009-10-16 12:59:47 +0000
@@ -17,18 +17,18 @@
 import os
 
 from bzrlib import (
-    conflicts
+    conflicts,
+    tests,
+    workingtree,
     )
-from bzrlib.workingtree import WorkingTree
-from bzrlib.tests.blackbox import ExternalBase
 
 # FIXME: These don't really look at the output of the conflict commands, just
 # the number of lines - there should be more examination.
 
-class TestConflicts(ExternalBase):
+class TestConflicts(tests.TestCaseWithTransport):
 
     def setUp(self):
-        super(ExternalBase, self).setUp()
+        super(TestConflicts, self).setUp()
         a_tree = self.make_branch_and_tree('a')
         self.build_tree_contents([
             ('a/myfile', 'contentsa\n'),
@@ -86,7 +86,7 @@
             self.run_bzr("resolve ../myfile")
             os.chdir("../../b")
             self.run_bzr("resolve ../a/myfile")
-            wt = WorkingTree.open_containing('.')[0]
+            wt = workingtree.WorkingTree.open_containing('.')[0]
             conflicts = wt.conflicts()
             if not conflicts.is_empty():
                 self.fail("tree still contains conflicts: %r" % conflicts)