← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_interrepository/test_fetch.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-24 03:04:58 UTC
  • mto: This revision was merged to the branch mainline in revision 6464.
  • Revision ID: jelmer@samba.org-20120124030458-aj2syolemmi6knri
Fix more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interrepository/test_fetch.py
77
77
            self.addCleanup(tree.unlock)
78
78
            tree.get_file_text('file1')
79
79
            for file_id in tree.all_file_ids():
80
 
                if tree.inventory[file_id].kind == "file":
 
80
                if tree.kind(file_id) == "file":
81
81
                    tree.get_file(file_id).read()
82
82
 
83
83
        # makes a target version repo
298
298
        stacked_branch.lock_read()
299
299
        self.addCleanup(stacked_branch.unlock)
300
300
        stacked_second_tree = stacked_branch.repository.revision_tree('second')
301
 
        self.assertEqual(second_tree.inventory, stacked_second_tree.inventory)
 
301
        self.assertEqual(second_tree.root_inventory,
 
302
            stacked_second_tree.root_inventory)
302
303
        # Finally, it's not enough to see that the basis inventories are
303
304
        # present.  The texts introduced in merge (and only those) should be
304
305
        # present, and also generating a stream should succeed without blowing
382
383
        (stacked_left_tree,
383
384
         stacked_right_tree) = new_stacked_branch.repository.revision_trees(
384
385
            ['left', 'right'])
385
 
        self.assertEqual(left_tree.inventory, stacked_left_tree.inventory)
386
 
        self.assertEqual(right_tree.inventory, stacked_right_tree.inventory)
 
386
        self.assertEqual(left_tree.root_inventory,
 
387
                stacked_left_tree.root_inventory)
 
388
        self.assertEqual(right_tree.root_inventory,
 
389
                stacked_right_tree.root_inventory)
387
390
        # Finally, it's not enough to see that the basis inventories are
388
391
        # present.  The texts introduced in merge (and only those) should be
389
392
        # present, and also generating a stream should succeed without blowing