← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2011-07-06 09:22:00 UTC
  • mfrom: (6008 +trunk)
  • mto: (6012.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6013.
  • Revision ID: v.ladeuil+lp@free.fr-20110706092200-7iai2mwzc0sqdsvf
Merging in trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_add_reference.py
34
34
 
35
35
    def _references_unsupported(self, tree):
36
36
        if not tree.supports_tree_reference():
37
 
            raise tests.TestSkipped('Tree format does not support references')
 
37
            raise tests.TestNotApplicable(
 
38
                'Tree format does not support references')
38
39
        else:
39
40
            self.fail('%r does not support references but should'
40
41
                % (tree, ))
53
54
        tree.lock_write()
54
55
        try:
55
56
            self.assertEqual(tree.path2id('sub-tree'), 'sub-tree-root-id')
56
 
            self.assertEqual(tree.inventory['sub-tree-root-id'].kind,
57
 
                             'tree-reference')
 
57
            self.assertEqual(tree.kind('sub-tree-root-id'), 'tree-reference')
58
58
            tree.commit('commit reference')
59
59
            basis = tree.basis_tree()
60
60
            basis.lock_read()