← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2006-08-03 14:27:38 UTC
  • mto: This revision was merged to the branch mainline in revision 1934.
  • Revision ID: abentley@panoramicfeedback.com-20060803142738-c25a7730d8a16b1a
Fix a bunch of test cases that assumed --merge-type or log-format

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_selftest.py
152
152
        result = self.run_bzr_subprocess('--versionn', retcode=3)
153
153
        result = self.run_bzr_subprocess('--versionn', retcode=None)
154
154
        self.assertContainsRe(result[1], 'unknown command')
155
 
        err = self.run_bzr_subprocess('merge', '--merge-type', 'magic merge', 
156
 
                                      retcode=3)[1]
 
155
        err = self.run_bzr_subprocess('merge', '--magic merge', retcode=3)[1]
157
156
        self.assertContainsRe(err, 'No known merge type magic merge')
158
157
 
159
158