Rev 2319: Add the DirStateRevisionTree to the list of 'tree_implementations' in http://bazaar.launchpad.net/%7Ebzr/bzr/dirstate

[John Arbash Meinel]

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

------------------------------------------------------------
revno: 2319
revision-id: john at arbash-meinel.com-20070215193713-z5sdz6594q7isee0
parent: john at arbash-meinel.com-20070215183224-grz0nmma8kve7go0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-15 13:37:13 -0600
message:
  Add the DirStateRevisionTree to the list of 'tree_implementations'
  Start fixing some tests by just locking the tree before testing.
modified:
  bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
  bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
-------------- next part --------------
=== modified file 'bzrlib/tests/tree_implementations/__init__.py'
--- a/bzrlib/tests/tree_implementations/__init__.py	2007-02-13 01:42:33 +0000
+++ b/bzrlib/tests/tree_implementations/__init__.py	2007-02-15 19:37:13 +0000
@@ -43,6 +43,10 @@
                                 WorkingTreeTestProviderAdapter,
                                 _legacy_formats,
                                 )
+from bzrlib.workingtree_4 import (
+    DirStateRevisionTree,
+    WorkingTreeFormat4,
+    )
 
 
 def return_parameter(something):
@@ -56,6 +60,11 @@
     return tree.branch.repository.revision_tree(revid)
 
 
+def _dirstate_tree_from_workingtree(tree):
+    revid = tree.commit('save tree', allow_pointless=True)
+    return tree.basis_tree()
+
+
 class TestTreeImplementationSupport(TestCaseWithTransport):
 
     def test_revision_tree_from_workingtree(self):
@@ -224,6 +233,14 @@
             RevisionTree.__name__)
         revision_tree_test.workingtree_to_test_tree = revision_tree_from_workingtree
         result.addTest(revision_tree_test)
+        dirstate_format = WorkingTreeFormat4()
+        dirstate_revision_tree_test = self._clone_test(
+            test,
+            dirstate_format._matchingbzrdir,
+            dirstate_format,
+            DirStateRevisionTree.__name__)
+        dirstate_revision_tree_test.workingtree_to_test_tree = _dirstate_tree_from_workingtree
+        result.addTest(dirstate_revision_tree_test)
         return result
 
 

=== modified file 'bzrlib/tests/tree_implementations/test_test_trees.py'
--- a/bzrlib/tests/tree_implementations/test_test_trees.py	2007-02-13 04:21:34 +0000
+++ b/bzrlib/tests/tree_implementations/test_test_trees.py	2007-02-15 19:37:13 +0000
@@ -24,6 +24,8 @@
     def test_empty_tree_no_parents(self):
         tree = self.make_branch_and_tree('.')
         tree = self.get_tree_no_parents_no_content(tree)
+        tree.lock_read()
+        self.addCleanup(tree.unlock)
         self.assertEqual([], tree.get_parent_ids())
         self.assertEqual([], tree.conflicts())
         self.assertEqual([], list(tree.unknowns()))
@@ -35,6 +37,8 @@
     def test_abc_tree_no_parents(self):
         tree = self.make_branch_and_tree('.')
         tree = self.get_tree_no_parents_abc_content(tree)
+        tree.lock_read()
+        self.addCleanup(tree.unlock)
         self.assertEqual([], tree.get_parent_ids())
         self.assertEqual([], tree.conflicts())
         self.assertEqual([], list(tree.unknowns()))
@@ -51,6 +55,8 @@
     def test_abc_tree_content_2_no_parents(self):
         tree = self.make_branch_and_tree('.')
         tree = self.get_tree_no_parents_abc_content_2(tree)
+        tree.lock_read()
+        self.addCleanup(tree.unlock)
         self.assertEqual([], tree.get_parent_ids())
         self.assertEqual([], tree.conflicts())
         self.assertEqual([], list(tree.unknowns()))
@@ -63,10 +69,12 @@
             [(path, node.file_id) for path, node in tree.iter_entries_by_dir()])
         self.assertEqualDiff('foobar\n', tree.get_file_text('a-id'))
         self.assertFalse(tree.is_executable('c-id'))
-        
+
     def test_abc_tree_content_3_no_parents(self):
         tree = self.make_branch_and_tree('.')
         tree = self.get_tree_no_parents_abc_content_3(tree)
+        tree.lock_read()
+        self.addCleanup(tree.unlock)
         self.assertEqual([], tree.get_parent_ids())
         self.assertEqual([], tree.conflicts())
         self.assertEqual([], list(tree.unknowns()))
@@ -79,10 +87,12 @@
             [(path, node.file_id) for path, node in tree.iter_entries_by_dir()])
         self.assertEqualDiff('contents of a\n', tree.get_file_text('a-id'))
         self.assertTrue(tree.is_executable('c-id'))
-        
+
     def test_abc_tree_content_4_no_parents(self):
         tree = self.make_branch_and_tree('.')
         tree = self.get_tree_no_parents_abc_content_4(tree)
+        tree.lock_read()
+        self.addCleanup(tree.unlock)
         self.assertEqual([], tree.get_parent_ids())
         self.assertEqual([], tree.conflicts())
         self.assertEqual([], list(tree.unknowns()))
@@ -95,10 +105,12 @@
             [(path, node.file_id) for path, node in tree.iter_entries_by_dir()])
         self.assertEqualDiff('contents of a\n', tree.get_file_text('a-id'))
         self.assertFalse(tree.is_executable('c-id'))
-        
+
     def test_abc_tree_content_5_no_parents(self):
         tree = self.make_branch_and_tree('.')
         tree = self.get_tree_no_parents_abc_content_5(tree)
+        tree.lock_read()
+        self.addCleanup(tree.unlock)
         self.assertEqual([], tree.get_parent_ids())
         self.assertEqual([], tree.conflicts())
         self.assertEqual([], list(tree.unknowns()))
@@ -111,10 +123,12 @@
             [(path, node.file_id) for path, node in tree.iter_entries_by_dir()])
         self.assertEqualDiff('bar\n', tree.get_file_text('a-id'))
         self.assertFalse(tree.is_executable('c-id'))
-        
+
     def test_abc_tree_content_6_no_parents(self):
         tree = self.make_branch_and_tree('.')
         tree = self.get_tree_no_parents_abc_content_6(tree)
+        tree.lock_read()
+        self.addCleanup(tree.unlock)
         self.assertEqual([], tree.get_parent_ids())
         self.assertEqual([], tree.conflicts())
         self.assertEqual([], list(tree.unknowns()))
@@ -133,6 +147,8 @@
         # to have it simply stop having the single unicode file in it
         # when dealing with a non-unicode filesystem.
         tree = self.get_tree_with_subdirs_and_all_content_types()
+        tree.lock_read()
+        self.addCleanup(tree.unlock)
         self.assertEqual([], tree.get_parent_ids())
         self.assertEqual([], tree.conflicts())
         self.assertEqual([], list(tree.unknowns()))