Rev 5822: (jelmer) Avoid using inventories in some repository tests. (Jelmer Vernooij) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5822 [merge]
revision-id: pqm at pqm.ubuntu.com-20110504173809-otz0gw0cvf2z9jbk
parent: pqm at pqm.ubuntu.com-20110504161727-0jmxnzxlelp7h8g0
parent: jelmer at samba.org-20110420001142-jnqxmgigbzkrwymb
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2011-05-04 17:38:09 +0000
message:
  (jelmer) Avoid using inventories in some repository tests. (Jelmer Vernooij)
modified:
  bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
=== modified file 'bzrlib/tests/per_repository/test_repository.py'
--- a/bzrlib/tests/per_repository/test_repository.py	2011-04-16 10:11:51 +0000
+++ b/bzrlib/tests/per_repository/test_repository.py	2011-04-20 00:11:42 +0000
@@ -210,8 +210,8 @@
         rev_tree = tree.branch.repository.revision_tree(second_revision)
         rev_tree.lock_read()
         self.addCleanup(rev_tree.unlock)
-        inv = rev_tree.inventory
-        rich_root = (inv.root.revision != second_revision)
+        root_revision = rev_tree.get_file_revision(rev_tree.get_root_id())
+        rich_root = (root_revision != second_revision)
         self.assertEqual(rich_root,
                          tree.branch.repository.supports_rich_root())
 
@@ -545,7 +545,8 @@
         rev_tree = tree.branch.repository.revision_tree(tree.last_revision())
         rev_tree.lock_read()
         self.addCleanup(rev_tree.unlock)
-        self.assertEqual('rev_id', rev_tree.inventory.root.revision)
+        root_id = rev_tree.get_root_id()
+        self.assertEqual('rev_id', rev_tree.get_file_revision(root_id))
 
     def test_pointless_commit(self):
         tree = self.make_branch_and_tree('.')
@@ -635,8 +636,8 @@
             # expected_record_names.
             # Note that the file keys can be in any order, so this test is
             # written to allow that.
-            inv = repo.get_inventory('rev_id')
-            root_item_key = ('file', inv.root.file_id, ['rev_id'])
+            rev_tree = repo.revision_tree('rev_id')
+            root_item_key = ('file', rev_tree.get_root_id(), ['rev_id'])
             self.assertTrue(root_item_key in item_keys)
             item_keys.remove(root_item_key)