← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2011-06-07 08:20:21 UTC
  • mfrom: (5957 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5960.
  • Revision ID: v.ladeuil+lp@free.fr-20110607082021-4wt3mlh9mqsn0djg
Merge trunk resolving conflict in news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_exceptions.py
17
17
"""Tests for display of exceptions."""
18
18
 
19
19
import os
20
 
import sys
 
20
import re
21
21
 
22
22
from bzrlib import (
23
23
    bzrdir,
58
58
            env_changes={"LANG": "C", "LC_ALL": "C"},
59
59
            universal_newlines=True,
60
60
            retcode=errors.EXIT_ERROR)
61
 
        self.assertContainsRe(err, r"^bzr: ERROR: .*'\\xa0'.* unsupported")
 
61
        self.assertContainsRe(err, r"^bzr: ERROR: .*'\\xa0'.* unsupported",
 
62
            flags=re.MULTILINE)
62
63
        self.assertEquals(out, "")
63
64
 
64
65