Rev 2453: All test_join tests passing. in http://bazaar.launchpad.net/~bzr/bzr/dirstate

[Robert Collins]

At http://bazaar.launchpad.net/~bzr/bzr/dirstate

------------------------------------------------------------
revno: 2453
revision-id: robertc at robertcollins.net-20070306013710-itl1i2q0ld7bgdke
parent: robertc at robertcollins.net-20070306012824-syeqpq1kri661vp9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 12:37:10 +1100
message:
  All test_join tests passing.
modified:
  bzrlib/tests/blackbox/test_join.py test_join.py-20060928210902-95dkqa6boh8uq92b-1
=== modified file 'bzrlib/tests/blackbox/test_join.py'
--- a/bzrlib/tests/blackbox/test_join.py	2007-03-02 09:44:41 +0000
+++ b/bzrlib/tests/blackbox/test_join.py	2007-03-06 01:37:10 +0000
@@ -68,6 +68,8 @@
         self.assertEqual('subtree-root-id', sub_tree.path2id(''))
         self.assertEqual('', sub_tree.id2path('subtree-root-id'))
         self.assertIs(None, base_tree.path2id('subtree/file1'))
+        base_tree.lock_read()
+        self.addCleanup(base_tree.unlock)
         self.assertTrue('file1-id' not in base_tree)
         self.assertEqual('subtree-root-id', base_tree.path2id('subtree'))
         self.assertEqual('subtree', base_tree.id2path('subtree-root-id'))