Rev 4624: (vila) Make TestLocale.test_log_BOGUS more robust in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4624 [merge]
revision-id: pqm at pqm.ubuntu.com-20090818082317-8g5738hvi41aqhsh
parent: pqm at pqm.ubuntu.com-20090818034251-w2biu3woo8y7bcf8
parent: v.ladeuil+lp at free.fr-20090818072002-fwba0yfpyhk04mkn
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-08-18 09:23:17 +0100
message:
  (vila) Make TestLocale.test_log_BOGUS more robust
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/blackbox/test_locale.py test_lang.py-20060824204205-80v50j25qkuop7yn-1
=== modified file 'NEWS'
--- a/NEWS	2009-08-18 01:38:56 +0000
+++ b/NEWS	2009-08-18 07:20:02 +0000
@@ -9,6 +9,12 @@
 In Development
 ##############
 
+Bug Fixes
+*********
+
+* Fix a test failure on karmic by making a locale test more robust.
+  (Vincent Ladeuil, #413514)
+
 Improvements
 ************
 

=== modified file 'bzrlib/tests/blackbox/test_locale.py'
--- a/bzrlib/tests/blackbox/test_locale.py	2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/blackbox/test_locale.py	2009-08-17 22:16:49 +0000
@@ -61,21 +61,7 @@
             '--no-aliases --no-plugins log -q --log-format=long tree',
                env_changes={'LANG':'BOGUS', 'BZR_PROGRESS_BAR':'none',
                             'LC_ALL':None, 'LC_CTYPE':None, 'LANGUAGE':None})
-        # XXX: This depends on the exact formatting of a locale.Error
-        # as the first part of the string. It may be a little tempermental
-        self.assertEqualDiff("""\
-bzr: warning: unsupported locale setting
-  bzr could not set the application locale.
-  Although this should be no problem for bzr itself,
-  it might cause problems with some plugins.
-  To investigate the issue, look at the output
-  of the locale(1p) tool available on POSIX systems.
-bzr: warning: unsupported locale setting
-  Could not determine what text encoding to use.
-  This error usually means your Python interpreter
-  doesn't support the locale set by $LANG (BOGUS)
-  Continuing with ascii encoding.
-""", err)
+        self.assertStartsWith(err, 'bzr: warning: unsupported locale setting')
         self.assertEqualDiff("""\
 ------------------------------------------------------------
 revno: 1