/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/per_workingtree/test_add.py

  • Committer: Jelmer Vernooij
  • Date: 2020-07-18 23:14:00 UTC
  • mfrom: (7490.40.62 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200718231400-jaes9qltn8oi8xss
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_add.py
50
50
            self.skipTest("tree does not support setting file ids")
51
51
        self.build_tree(['a', 'b'])
52
52
        tree.add(['a'])
53
 
        self.assertRaises(errors.DuplicateFileId,
54
 
                          tree.add, ['b'], [tree.path2id('a')])
 
53
        self.assertRaises(
 
54
            inventory.DuplicateFileId, tree.add, ['b'], [tree.path2id('a')])
55
55
        # And the entry should not have been added.
56
56
        self.assertTreeLayout(['', 'a'], tree)
57
57