~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_aliases.py

  • Committer: Martin Pool
  • Date: 2006-06-15 05:36:34 UTC
  • mto: This revision was merged to the branch mainline in revision 1797.
  • Revision ID: mbp@sourcefrog.net-20060615053634-4fd52ba691855659
Clean up many exception classes.

Errors indicating a user error are now shown with is_user_error on the
exception; use this rather than hardcoding a list of exceptions that should be
handled this way.

Exceptions now inherit from BzrNewException where possible to use consistent
formatting method.

Remove rather obsolete docstring test on Branch.missing_revisions.

Remove dead code from find_merge_base.


Show diffs side-by-side

added added

removed removed

Lines of Context:
57
57
 
58
58
        # If --no-aliases breaks all of bzr, we also get retcode=3
59
59
        # So we need to catch the output as well
60
 
        self.assertEquals(bzr_catch_error('--no-aliases', 'c', 'a', 
61
 
                                          retcode=None), 
62
 
                          "bzr: ERROR: unknown command 'c'\n")
 
60
        self.assertEquals(bzr_catch_error('--no-aliases', 'c', 'a',
 
61
                                          retcode=None),
 
62
                          'bzr: ERROR: unknown command "c"\n')
63
63
 
64
64
        bzr('c', '-r1', '-r2', retcode=3)
65
65
        bzr('c1', '-r1', '-r2', retcode=3)