← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_options.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/test_options.py
28
28
    def test_option_help(self):
29
29
        """Options have help strings."""
30
30
        out, err = self.run_bzr_captured(['commit', '--help'])
31
 
        self.assertContainsRe(out, r'--file.*file containing commit message')
32
 
        self.assertContainsRe(out, r'--help.*-h')
 
31
        self.assertContainsRe(out, r'--file(.|\n)*file containing commit'
 
32
                                   ' message')
 
33
        self.assertContainsRe(out, r'-h.*--help')
33
34
 
34
35
    def test_option_help_global(self):
35
36
        """Global options have help strings."""