← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge sftp-leaks into catch-them-all

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
381
381
 
382
382
    def test_log_bad_message_re(self):
383
383
        """Bad --message argument gives a sensible message
384
 
        
 
384
 
385
385
        See https://bugs.launchpad.net/bzr/+bug/251352
386
386
        """
387
387
        self.make_minimal_branch()
388
388
        out, err = self.run_bzr(['log', '-m', '*'], retcode=3)
389
 
        self.assertEqual("bzr: ERROR: Invalid regular expression"
390
 
            " in log message filter"
391
 
            ": '*'"
392
 
            ": nothing to repeat\n", err)
393
 
        self.assertEqual('', out)
 
389
        self.assertContainsRe(err, "ERROR.*Invalid pattern.*nothing to repeat")
 
390
        self.assertNotContainsRe(err, "Unprintable exception")
 
391
        self.assertEqual(out, '')
394
392
 
395
393
    def test_log_unsupported_timezone(self):
396
394
        self.make_linear_branch()