Rev 2442: Extend the test slightly. in http://bzr.arbash-meinel.com/branches/bzr/0.16-dev/rename_directory_105479

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/0.16-dev/rename_directory_105479

------------------------------------------------------------
revno: 2442
revision-id: john at arbash-meinel.com-20070420182016-yalhqlbsw2fmfl3w
parent: john at arbash-meinel.com-20070420181339-dzr68u9iywq2elxs
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 13:20:16 -0500
message:
  Extend the test slightly.
  Oddly enough, both newly added records are moved correctly,
  but the existing directory 'c/b/d' is not moved.
modified:
  bzrlib/tests/workingtree_implementations/test_move.py test_move.py-20070225171927-mohn2vqj5fx7edc6-1
-------------- next part --------------
=== modified file 'bzrlib/tests/workingtree_implementations/test_move.py'
--- a/bzrlib/tests/workingtree_implementations/test_move.py	2007-04-20 18:13:39 +0000
+++ b/bzrlib/tests/workingtree_implementations/test_move.py	2007-04-20 18:20:16 +0000
@@ -375,7 +375,7 @@
                               ], tree)
         tree._validate()
 
-    def test_move_directory_into_parent_with_new_child(self):
+    def test_move_directory_into_parent_with_new_children(self):
         tree = self.make_branch_and_tree('.')
         self.build_tree(['c/', 'c/b/', 'c/b/d/'])
         tree.add(['c', 'c/b', 'c/b/d'],
@@ -383,8 +383,8 @@
         tree.commit('initial', rev_id='rev-1')
         root_id = tree.get_root_id()
 
-        self.build_tree(['c/b/a/'])
-        tree.add(['c/b/a'], ['a-id'])
+        self.build_tree(['c/b/a/', 'c/b/e/'])
+        tree.add(['c/b/a', 'c/b/e'], ['a-id', 'e-id'])
 
         self.assertEqual([('c/b', 'b')],
                          tree.move(['c/b'], ''))
@@ -393,6 +393,7 @@
                                ('c', 'c-id'),
                                ('b/a', 'a-id'),
                                ('b/d', 'd-id'),
+                               ('b/e', 'e-id'),
                               ], tree)
         tree._validate()