Rev 2365: Simplify the test even further.... in http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/dirstate_93681

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/dirstate_93681

------------------------------------------------------------
revno: 2365
revision-id: john at arbash-meinel.com-20070320004911-0qajqnddr3rf9r2e
parent: john at arbash-meinel.com-20070320004104-mwai9d85fym5n0hf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_93681
timestamp: Mon 2007-03-19 19:49:11 -0500
message:
  Simplify the test even further....
  Basically, if you have a file deleted as removed, and then you unversion its directory
  it deletes all records in the dirblock, not realizing that some of them might
  already be marked as removed.
modified:
  bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
-------------- next part --------------
=== modified file 'bzrlib/tests/workingtree_implementations/test_commit.py'
--- a/bzrlib/tests/workingtree_implementations/test_commit.py	2007-03-20 00:41:04 +0000
+++ b/bzrlib/tests/workingtree_implementations/test_commit.py	2007-03-20 00:49:11 +0000
@@ -199,12 +199,12 @@
         self.assertFalse(wt.has_filename('d'))
         wt.unlock()
 
-    def test_commit_deleted_subtree_with_rename(self):
+    def test_commit_deleted_subtree_with_removed(self):
         wt = self.make_branch_and_tree('.')
         self.build_tree(['a', 'b/', 'b/c', 'd'])
         wt.add(['a', 'b', 'b/c'], ['a-id', 'b-id', 'c-id'])
         wt.commit('first')
-        wt.rename_one('b/c', 'b/d')
+        wt.remove('b/c')
         this_dir = self.get_transport()
         this_dir.delete_tree('b')
         wt.lock_write()
@@ -215,7 +215,6 @@
         self.assertTrue(wt.has_filename('a'))
         self.assertFalse(wt.has_filename('b'))
         self.assertFalse(wt.has_filename('b/c'))
-        self.assertFalse(wt.has_filename('b/d'))
         wt.unlock()
 
     def test_commit_move_new(self):