Rev 2390: Add locking in the test_commit_kind_changes test. in http://bazaar.launchpad.net/%7Ebzr/bzr/dirstate

[John Arbash Meinel]

At http://bazaar.launchpad.net/%7Ebzr/bzr/dirstate

------------------------------------------------------------
revno: 2390
revision-id: john at arbash-meinel.com-20070225170249-fcgtqn57yinqxsc2
parent: john at arbash-meinel.com-20070225165633-d9x1okv4g33idiya
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Sun 2007-02-25 11:02:49 -0600
message:
  Add locking in the test_commit_kind_changes test.
modified:
  bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
-------------- next part --------------
=== modified file 'bzrlib/tests/test_commit.py'
--- a/bzrlib/tests/test_commit.py	2007-02-06 14:52:16 +0000
+++ b/bzrlib/tests/test_commit.py	2007-02-25 17:02:49 +0000
@@ -554,6 +554,14 @@
         timestamp_1ms = round(timestamp, 3)
         self.assertEqual(timestamp_1ms, timestamp)
 
+    def assertBasisTreeKind(self, kind, tree, file_id):
+        basis = tree.basis_tree()
+        basis.lock_read()
+        try:
+            self.assertEqual(kind, basis.kind(file_id))
+        finally:
+            basis.unlock()
+
     def test_commit_kind_changes(self):
         if not osutils.has_symlinks():
             raise tests.TestSkipped('Test requires symlink support')
@@ -561,43 +569,43 @@
         os.symlink('target', 'name')
         tree.add('name', 'a-file-id')
         tree.commit('Added a symlink')
-        self.assertEqual('symlink', tree.basis_tree().kind('a-file-id'))
+        self.assertBasisTreeKind('symlink', tree, 'a-file-id')
 
         os.unlink('name')
         self.build_tree(['name'])
         tree.commit('Changed symlink to file')
-        self.assertEqual('file', tree.basis_tree().kind('a-file-id'))
+        self.assertBasisTreeKind('file', tree, 'a-file-id')
 
         os.unlink('name')
         os.symlink('target', 'name')
         tree.commit('file to symlink')
-        self.assertEqual('symlink', tree.basis_tree().kind('a-file-id'))
+        self.assertBasisTreeKind('symlink', tree, 'a-file-id')
 
         os.unlink('name')
         os.mkdir('name')
         tree.commit('symlink to directory')
-        self.assertEqual('directory', tree.basis_tree().kind('a-file-id'))
+        self.assertBasisTreeKind('directory', tree, 'a-file-id')
 
         os.rmdir('name')
         os.symlink('target', 'name')
         tree.commit('directory to symlink')
-        self.assertEqual('symlink', tree.basis_tree().kind('a-file-id'))
+        self.assertBasisTreeKind('symlink', tree, 'a-file-id')
 
         # prepare for directory <-> file tests
         os.unlink('name')
         os.mkdir('name')
         tree.commit('symlink to directory')
-        self.assertEqual('directory', tree.basis_tree().kind('a-file-id'))
+        self.assertBasisTreeKind('directory', tree, 'a-file-id')
 
         os.rmdir('name')
         self.build_tree(['name'])
         tree.commit('Changed directory to file')
-        self.assertEqual('file', tree.basis_tree().kind('a-file-id'))
+        self.assertBasisTreeKind('file', tree, 'a-file-id')
 
         os.unlink('name')
         os.mkdir('name')
         tree.commit('file to directory')
-        self.assertEqual('directory', tree.basis_tree().kind('a-file-id'))
+        self.assertBasisTreeKind('directory', tree, 'a-file-id')
 
     def test_commit_unversioned_specified(self):
         """Commit should raise if specified files isn't in basis or worktree"""