Rev 6524: (vila) Fix some test isolation issues when random env vars are used. in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6524 [merge]
revision-id: pqm at pqm.ubuntu.com-20120516092351-juhkm3zdl63nod8b
parent: pqm at pqm.ubuntu.com-20120419102945-4fmzcqhvnpwbw61b
parent: v.ladeuil+lp at free.fr-20120516085421-dd91h9qm3yb2j7xb
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2012-05-16 09:23:51 +0000
message:
  (vila) Fix some test isolation issues when random env vars are used.
   (Vincent Ladeuil)
modified:
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2012-03-29 12:27:52 +0000
+++ b/bzrlib/config.py	2012-05-16 08:54:21 +0000
@@ -2398,7 +2398,8 @@
                 value = self.default()
                 if not isinstance(value, unicode):
                     raise AssertionError(
-                    'Callable default values should be unicode')
+                        "Callable default value for '%s' should be unicode"
+                        % (self.name))
             else:
                 value = self.default
         return value

=== modified file 'bzrlib/tests/test_config.py'
--- a/bzrlib/tests/test_config.py	2012-03-29 12:27:52 +0000
+++ b/bzrlib/tests/test_config.py	2012-05-16 08:54:21 +0000
@@ -2477,7 +2477,6 @@
 
     def test_help_is_set(self):
         option_help = self.registry.get_help(self.option_name)
-        self.assertNotEquals(None, option_help)
         # Come on, think about the user, he really wants to know what the
         # option is about
         self.assertIsNot(None, option_help)
@@ -3584,6 +3583,7 @@
         return config.MemoryStack(content)
 
     def test_override_value_from_env(self):
+        self.overrideEnv('FOO', None)
         self.registry.register(
             config.Option('foo', default='bar', override_from_env=['FOO']))
         self.overrideEnv('FOO', 'quux')
@@ -3592,6 +3592,9 @@
         self.assertEquals('quux', conf.get('foo'))
 
     def test_first_override_value_from_env_wins(self):
+        self.overrideEnv('NO_VALUE', None)
+        self.overrideEnv('FOO', None)
+        self.overrideEnv('BAZ', None)
         self.registry.register(
             config.Option('foo', default='bar',
                           override_from_env=['NO_VALUE', 'FOO', 'BAZ']))