Rev 5953: (jelmer) Allow for preceding lines when checking that we warn if argv is in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5953 [merge]
revision-id: pqm at pqm.ubuntu.com-20110602100856-l5yozjq1kir6qw44
parent: pqm at pqm.ubuntu.com-20110601145916-5uuwhu9e764po62d
parent: jelmer at samba.org-20110602092146-0v04r03xxnv4l3r9
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2011-06-02 10:08:56 +0000
message:
  (jelmer) Allow for preceding lines when checking that we warn if argv is
   undecodable. (Jelmer Vernooij)
modified:
  bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
=== modified file 'bzrlib/tests/blackbox/test_exceptions.py'
--- a/bzrlib/tests/blackbox/test_exceptions.py	2011-05-26 08:05:45 +0000
+++ b/bzrlib/tests/blackbox/test_exceptions.py	2011-06-02 09:21:46 +0000
@@ -17,7 +17,7 @@
 """Tests for display of exceptions."""
 
 import os
-import sys
+import re
 
 from bzrlib import (
     bzrdir,
@@ -58,7 +58,8 @@
             env_changes={"LANG": "C", "LC_ALL": "C"},
             universal_newlines=True,
             retcode=errors.EXIT_ERROR)
-        self.assertContainsRe(err, r"^bzr: ERROR: .*'\\xa0'.* unsupported")
+        self.assertContainsRe(err, r"^bzr: ERROR: .*'\\xa0'.* unsupported",
+            flags=re.MULTILINE)
         self.assertEquals(out, "")