Merge lp:~larstiq/bzr/xdg-config into lp:bzr/2.5

[Wouter van Heyst]

Isolate config dir test from XDG_CONFIG_HOME

I actually have XDG_CONFIG_HOME set, which broke bzrlib.tests.test_config.TestXDGConfigDir.test_xdg_config_dir_exists.

This change unsets XDG_CONFIG_HOME from the environment at the start of that test.

[Martin Packman (gz)]

Thanks!

review: Approve

[Martin Packman (gz)]

sent to pqm by email

[Vincent Ladeuil (vila)]

Argh, too late :-(

This should be taken care of for *all* tests as all other env variables in tests/__init__.py

[Martin Packman (gz)]

Wouter could always do another mp with more env changes, if you point him in the right direction. :)

[Vincent Ladeuil (vila)]

@Larstiq: look for isolated_environ in bzrlib/tests/__init__.py, the comment should be reasonably clear, if not, feel free to tweak it ;)

Basically, it's a list of env vars that should be cleared/set to properly isolate the tests from the running env. Your patch here does exactly that for a single test.

[Wouter van Heyst (larstiq)]

Thanks Vincent, fixed properly now :)

=== modified file 'bzrlib/tests/test_config.py'
--- bzrlib/tests/test_config.py	2012-03-26 17:01:21 +0000
+++ bzrlib/tests/test_config.py	2012-04-30 08:13: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)