/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/blackbox/test_aliases.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_aliases.py
34
34
        def bzr_catch_error(args, **kwargs):
35
35
            return self.run_bzr(args, **kwargs)[1]
36
36
 
37
 
        conf = config.GlobalConfig.from_string(b'''[ALIASES]
 
37
 
 
38
        conf = config.GlobalConfig.from_string('''[ALIASES]
38
39
c=cat
39
40
c1=cat -r 1
40
41
c2=cat -r 1 -r2
63
64
        # If --no-aliases breaks all of bzr, we also get retcode=3
64
65
        # So we need to catch the output as well
65
66
        self.assertEqual(bzr_catch_error('--no-aliases c a',
66
 
                                         retcode=None),
67
 
                         'brz: ERROR: unknown command "c". '
68
 
                         'Perhaps you meant "ci"\n')
 
67
                                          retcode=None),
 
68
                          'brz: ERROR: unknown command "c". '
 
69
                          'Perhaps you meant "ci"\n')
69
70
 
70
71
        bzr('c -r1 -r2', retcode=3)
71
72
        bzr('c1 -r1 -r2', retcode=3)