Bazaar

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

  1. xdg-config
  2. Merge into 2.5
Proposed by Wouter van Heyst
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: no longer in the source branch.
Merged at revision: 6498
Proposed branch: lp:~larstiq/bzr/xdg-config
Merge into: lp:bzr/2.5
Diff against target: 23 lines (+1/-1)
2 files modified
bzrlib/tests/__init__.py (+1/-0)
bzrlib/tests/test_config.py (+0/-1)
To merge this branch: bzr merge lp:~larstiq/bzr/xdg-config
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve
Review via email: mp+104080@code.launchpad.net

This proposal supersedes a proposal from 2012-04-30.

Commit message

Make sure the XDG_CONFIG_HOME environment variable doesn't leak into any test.

Description of the change

Make sure the XDG_CONFIG_HOME environment variable doesn't leak into any test.

To post a comment you must log in.
Revision history for this message
Vincent Ladeuil (vila) wrote :

Exactly ! Thanks.

review: Approve
Revision history for this message
Vincent Ladeuil (vila) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/tests/__init__.py'
2--- bzrlib/tests/__init__.py 2012-03-09 16:48:55 +0000
3+++ bzrlib/tests/__init__.py 2012-04-30 10:08:17 +0000
4@@ -137,6 +137,7 @@
5 isolated_environ = {
6 'BZR_HOME': None,
7 'HOME': None,
8+ 'XDG_CONFIG_HOME': None,
9 # bzr now uses the Win32 API and doesn't rely on APPDATA, but the
10 # tests do check our impls match APPDATA
11 'BZR_EDITOR': None, # test_msgeditor manipulates this variable
12
13=== modified file 'bzrlib/tests/test_config.py'
14--- bzrlib/tests/test_config.py 2012-04-30 08:06:24 +0000
15+++ bzrlib/tests/test_config.py 2012-04-30 10:08:17 +0000
16@@ -611,7 +611,6 @@
17
18 def test_xdg_config_dir_exists(self):
19 """When ~/.config/bazaar exists, use it as the config dir."""
20- self.overrideEnv('XDG_CONFIG_HOME', None)
21 newdir = osutils.pathjoin(self.test_home_dir, '.config', 'bazaar')
22 os.makedirs(newdir)
23 self.assertEqual(config.config_dir(), newdir)

Subscribers

People subscribed via source and target branches