Merge lp:~jelmer/bzr-builddeb/fix-do-tests-2 into lp:bzr-builddeb

[Jelmer Vernooij]

Use config_dir() to find the Bazaar home directory, so we find the right directory during blackbox test runs. Fixes the "bzr bd-do" tests on my machines because I have a custom builddeb.conf.

[lp:~jelmer/bzr-builddeb/fix-do-tests-2]

467. By Jelmer Vernooij on 2010-08-11

Determine Bazaar home directory using bzrlib to prevent test
isolation issues. LP: #614125

=== modified file '__init__.py'
--- __init__.py	2010-05-03 03:03:34 +0000
+++ __init__.py	2010-08-11 15:58:46 +0000
@@ -33,6 +33,7 @@
     msgeditor,
     )
 from bzrlib.commands import plugin_cmds
+from bzrlib.config import config_dir
 from bzrlib.directory_service import directories
 
 from info import (
@@ -70,7 +71,8 @@
 
 builddeb_dir = '.bzr-builddeb'
 default_conf = os.path.join(builddeb_dir, 'default.conf')
-global_conf = os.path.expanduser('~/.bazaar/builddeb.conf')
+def global_conf():
+    return os.path.join(config_dir(), 'builddeb.conf')
 local_conf = os.path.join(builddeb_dir, 'local.conf')
 
 default_build_dir = '../build-area'

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-29 18:51:39 +0000
+++ debian/changelog	2010-08-11 15:58:46 +0000
@@ -27,7 +27,11 @@
     appropriate when doing a merge from Debian or similar. LP: #576027
   * Fixed a logic error that stops -r working in merge-upstream. LP: #594575
 
- -- James Westby <[e-mail]>  Thu, 06 May 2010 15:22:40 +0100
+  [ Jelmer Vernooij ]
+  * Determine Bazaar home directory using bzrlib to prevent test
+    isolation issues. LP: #614125
+
+ -- Jelmer Vernooij <[e-mail]>  Wed, 11 Aug 2010 17:52:23 +0200
 
 bzr-builddeb (2.4.2) UNRELEASED; urgency=low
 

=== modified file 'launchpad.py'
--- launchpad.py	2010-03-31 20:59:18 +0000
+++ launchpad.py	2010-08-11 15:58:46 +0000
@@ -20,6 +20,7 @@
 
 import os
 
+from bzrlib.config import config_dir
 from bzrlib.trace import mutter
 
 try:
@@ -32,7 +33,7 @@
 
 
 def _get_launchpad():
-    creds_path = os.path.expanduser("~/.bazaar/builddeb.lp_creds.txt")
+    creds_path = os.path.join(config_dir(), "builddeb.lp_creds.txt")
     if not os.path.exists(creds_path):
         return None
     creds = Credentials("bzr-builddeb")

=== modified file 'util.py'
--- util.py	2010-07-29 18:41:30 +0000
+++ util.py	2010-08-11 15:58:46 +0000
@@ -529,8 +529,8 @@
         else:
             warning('Not using configuration from %s as it is versioned.')
     if not no_user_config:
-        config_files.append((global_conf, True))
-        user_config = global_conf
+        config_files.append((global_conf(), True))
+        user_config = global_conf()
     if tree.path2id(default_conf):
         config_files.append((tree.get_file(tree.path2id(default_conf)), False,
                     "default.conf"))