← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_subsume.py

  • Committer: INADA Naoki
  • Date: 2011-05-14 14:59:06 UTC
  • mto: This revision was merged to the branch mainline in revision 5874.
  • Revision ID: songofacandy@gmail.com-20110514145906-xj3xa06jihd4wapq
Notify when test_textwrap is skipped.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_subsume.py
91
91
        self.assertEqualDiff(file2_contents,
92
92
                             basis_tree.get_file_text('file2-id'))
93
93
        self.assertEqual('subtree-1',
94
 
                         basis_tree.inventory['file2-id'].revision)
 
94
                         basis_tree.get_file_revision('file2-id'))
95
95
        self.assertEqual('combined-1',
96
 
                         basis_tree.inventory[sub_root_id].revision)
 
96
                         basis_tree.get_file_revision(sub_root_id))
97
97
 
98
98
    def test_subsume_failure(self):
99
99
        base_tree, sub_tree = self.make_trees()