← 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: Patch Queue Manager
  • Date: 2012-02-07 00:57:24 UTC
  • mfrom: (6405.2.18 bzr)
  • Revision ID: pqm@pqm.ubuntu.com-20120207005724-xvfawh5exf1ohusu
(jelmer) Rename Tree.inventory to Tree.root_inventory. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interrepository/test_fetch.py
235
235
         stacked_right_tree) = stacked_branch.repository.revision_trees(
236
236
            ['left', 'right'])
237
237
        self.assertEqual(
238
 
            left_tree.inventory, stacked_left_tree.inventory)
 
238
            left_tree.root_inventory, stacked_left_tree.root_inventory)
239
239
        self.assertEqual(
240
 
            right_tree.inventory, stacked_right_tree.inventory)
 
240
            right_tree.root_inventory, stacked_right_tree.root_inventory)
241
241
 
242
242
        # Finally, it's not enough to see that the basis inventories are
243
243
        # present.  The texts introduced in merge (and only those) should be
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,
302
 
            stacked_second_tree.inventory)
 
301
        self.assertEqual(second_tree.root_inventory,
 
302
            stacked_second_tree.root_inventory)
303
303
        # Finally, it's not enough to see that the basis inventories are
304
304
        # present.  The texts introduced in merge (and only those) should be
305
305
        # present, and also generating a stream should succeed without blowing
383
383
        (stacked_left_tree,
384
384
         stacked_right_tree) = new_stacked_branch.repository.revision_trees(
385
385
            ['left', 'right'])
386
 
        self.assertEqual(left_tree.inventory,
387
 
                stacked_left_tree.inventory)
388
 
        self.assertEqual(right_tree.inventory,
389
 
                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)
390
390
        # Finally, it's not enough to see that the basis inventories are
391
391
        # present.  The texts introduced in merge (and only those) should be
392
392
        # present, and also generating a stream should succeed without blowing