Rev 6495: (gz) Isolate config dir test from XDG_CONFIG_HOME (Wouter van Heyst) 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: 6495 [merge]
revision-id: pqm at pqm.ubuntu.com-20120430090202-5urvt0x32da93go9
parent: pqm at pqm.ubuntu.com-20120329125301-y49qakymoxms51fh
parent: larstiq at larstiq.dyndns.org-20120430080624-7d9sg0vkvl64vgc4
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.5
timestamp: Mon 2012-04-30 09:02:02 +0000
message:
  (gz) Isolate config dir test from XDG_CONFIG_HOME (Wouter van Heyst)
modified:
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
=== modified file 'bzrlib/tests/test_config.py'
--- a/bzrlib/tests/test_config.py	2012-03-26 17:01:21 +0000
+++ b/bzrlib/tests/test_config.py	2012-04-30 08:06:24 +0000
@@ -611,6 +611,7 @@
 
     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)