← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_parents.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-28 10:06:39 UTC
  • mfrom: (6437.40.2 rmbranch-colo)
  • mto: This revision was merged to the branch mainline in revision 6482.
  • Revision ID: jelmer@samba.org-20120228100639-p5gndu91wuqwugti
Merge rmbranch-colo.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_parents.py
365
365
        result_basis = tree.basis_tree()
366
366
        result_basis.lock_read()
367
367
        try:
368
 
            self.assertEqual(expected_inventory, result_basis.inventory)
 
368
            self.assertEqual(expected_inventory, result_basis.root_inventory)
369
369
        finally:
370
370
            result_basis.unlock()
371
371
 
396
396
                self._inventory = shape
397
397
 
398
398
            def get_file_text(self, file_id, path=None):
399
 
                ie = self.inventory[file_id]
 
399
                ie = self.root_inventory[file_id]
400
400
                if ie.kind != "file":
401
401
                    return ""
402
402
                return 'a' * ie.text_size