Rev 5883: (jelmer) Remove the use of inventory in another CommitBuilder test. (Jelmer in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5883 [merge]
revision-id: pqm at pqm.ubuntu.com-20110517231845-pkd57to3k7w8gs5q
parent: pqm at pqm.ubuntu.com-20110517215549-utp7a0cko8vc0bb8
parent: jelmer at samba.org-20110517151959-rygueluz3ic1lakb
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2011-05-17 23:18:45 +0000
message:
  (jelmer) Remove the use of inventory in another CommitBuilder test. (Jelmer
   Vernooij)
modified:
  bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
=== modified file 'bzrlib/tests/per_repository/test_commit_builder.py'
--- a/bzrlib/tests/per_repository/test_commit_builder.py	2011-05-14 21:16:04 +0000
+++ b/bzrlib/tests/per_repository/test_commit_builder.py	2011-05-17 15:19:59 +0000
@@ -304,14 +304,15 @@
             # pointless commit.
             self.assertFalse(builder.any_changes())
             builder.finish_inventory()
-            new_root = tree.branch.repository.get_inventory(
-                builder._new_revision_id).root
+            builder_tree = builder.revision_tree()
+            new_root_id = builder_tree.get_root_id()
+            new_root_revision = builder_tree.get_file_revision(new_root_id)
             if tree.branch.repository.supports_rich_root():
                 # We should not have seen a new root revision
-                self.assertEqual(old_revision_id, new_root.revision)
+                self.assertEqual(old_revision_id, new_root_revision)
             else:
                 # We should see a new root revision
-                self.assertNotEqual(old_revision_id, new_root.revision)
+                self.assertNotEqual(old_revision_id, new_root_revision)
         finally:
             builder.abort()
             tree.unlock()