/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/test_conflicts.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-14 21:15:49 UTC
  • mto: This revision was merged to the branch mainline in revision 6734.
  • Revision ID: jelmer@jelmer.uk-20170714211549-7yoq325d6tydalg7
Move BadOptionValue to breezy.option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_conflicts.py
1178
1178
        return self.parser.parse_args(args)
1179
1179
 
1180
1180
    def test_unknown_action(self):
1181
 
        self.assertRaises(errors.BadOptionValue,
 
1181
        self.assertRaises(option.BadOptionValue,
1182
1182
                          self.parse, ['--action', 'take-me-to-the-moon'])
1183
1183
 
1184
1184
    def test_done(self):