Rev 5015: Fix imports in per_workingtree/test_smart_add.py. in file:///home/vila/src/bzr/bugs/322767-dont-add-conflict-related-files/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/322767-dont-add-conflict-related-files/

------------------------------------------------------------
revno: 5015
revision-id: v.ladeuil+lp at free.fr-20100208100004-c7tsmoqyt13vfkx3
parent: v.ladeuil+lp at free.fr-20100208095058-d65n1m2u0hvayxyu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 322767-dont-add-conflict-related-files
timestamp: Mon 2010-02-08 11:00:04 +0100
message:
  Fix imports in per_workingtree/test_smart_add.py.
-------------- next part --------------
=== modified file 'bzrlib/tests/per_workingtree/test_smart_add.py'
--- a/bzrlib/tests/per_workingtree/test_smart_add.py	2009-11-08 04:49:06 +0000
+++ b/bzrlib/tests/per_workingtree/test_smart_add.py	2010-02-08 10:00:04 +0000
@@ -27,15 +27,13 @@
     tests,
     workingtree,
     )
-from bzrlib.add import (
-    AddAction,
-    AddFromBaseAction,
+from bzrlib.tests import (
+    test_smart_add,
+    per_workingtree,
     )
-from bzrlib.tests.test_smart_add import AddCustomIDAction
-from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
-
-
-class TestSmartAddTree(TestCaseWithWorkingTree):
+
+
+class TestSmartAddTree(per_workingtree.TestCaseWithWorkingTree):
 
     def test_single_file(self):
         tree = self.make_branch_and_tree('tree')
@@ -205,7 +203,8 @@
 
     def test_custom_ids(self):
         sio = StringIO()
-        action = AddCustomIDAction(to_file=sio, should_print=True)
+        action = test_smart_add.AddCustomIDAction(to_file=sio,
+                                                  should_print=True)
         self.build_tree(['file1', 'dir1/', 'dir1/file2'])
 
         wt = self.make_branch_and_tree('.')