Rev 6498: (vila) Make sure the XDG_CONFIG_HOME environment variable doesn't leak into in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.5/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.5/

------------------------------------------------------------
revno: 6498 [merge]
revision-id: pqm at pqm.ubuntu.com-20120430113758-w9ifye5bbp4evkoa
parent: pqm at pqm.ubuntu.com-20120430111200-3zw0af8s9hhx877t
parent: larstiq at larstiq.dyndns.org-20120430095033-lyszq0vytgqpn5fw
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.5
timestamp: Mon 2012-04-30 11:37:58 +0000
message:
  (vila) Make sure the XDG_CONFIG_HOME environment variable doesn't leak into
   any test. (Wouter van Heyst)
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2012-03-09 16:48:55 +0000
+++ b/bzrlib/tests/__init__.py	2012-04-30 09:50:33 +0000
@@ -137,6 +137,7 @@
 isolated_environ = {
     'BZR_HOME': None,
     'HOME': None,
+    'XDG_CONFIG_HOME': None,
     # bzr now uses the Win32 API and doesn't rely on APPDATA, but the
     # tests do check our impls match APPDATA
     'BZR_EDITOR': None, # test_msgeditor manipulates this variable

=== modified file 'bzrlib/tests/test_config.py'
--- a/bzrlib/tests/test_config.py	2012-04-30 08:06:24 +0000
+++ b/bzrlib/tests/test_config.py	2012-04-30 09:50:33 +0000
@@ -611,7 +611,6 @@
 
     def test_xdg_config_dir_exists(self):
         """When ~/.config/bazaar exists, use it as the config dir."""
-        self.overrideEnv('XDG_CONFIG_HOME', None)
         newdir = osutils.pathjoin(self.test_home_dir, '.config', 'bazaar')
         os.makedirs(newdir)
         self.assertEqual(config.config_dir(), newdir)