Rev 2465: Fix test_join with dirstate default. in http://bazaar.launchpad.net/~bzr/bzr/dirstate

[Robert Collins]

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

------------------------------------------------------------
revno: 2465
revision-id: robertc at robertcollins.net-20070306052123-xfits0qiztraqs7m
parent: robertc at robertcollins.net-20070306051023-3bd91ashnq3ppdkh
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 16:21:23 +1100
message:
  Fix test_join with dirstate default.
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-06 04:20:50 +0000
+++ b/bzrlib/tests/blackbox/test_join.py	2007-03-06 05:21:23 +0000
@@ -60,9 +60,8 @@
         """Join can add a reference if --reference is supplied"""
         base_tree, sub_tree = self.make_trees()
         self.run_bzr('join', '.', '--reference', working_dir='tree/subtree')
-        # Restore trees, because run_bzr is out-of-band
-        base_tree = workingtree.WorkingTree.open('tree')
-        sub_tree = workingtree.WorkingTree.open('tree/subtree')
+        sub_tree.lock_read()
+        self.addCleanup(sub_tree.unlock)
         self.assertEqual('file1-id', sub_tree.path2id('file1'))
         self.assertTrue('file1-id' in sub_tree)
         self.assertEqual('subtree-root-id', sub_tree.path2id(''))