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

[Wouter van Heyst]

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

=== modified file 'bzrlib/i18n.py'
--- bzrlib/i18n.py	2011-12-19 13:23:58 +0000
+++ bzrlib/i18n.py	2012-04-30 10:00:30 +0000
@@ -136,19 +136,18 @@
 
     :param base: plugins can specify their own local directory
     """
-    if hasattr(sys, 'frozen'):
+    fs_enc = sys.getfilesystemencoding()
+    if getattr(sys, 'frozen', False):
         if base is None:
-            base = os.path.dirname(
-                unicode(sys.executable, sys.getfilesystemencoding()))
+            base = os.path.dirname(unicode(sys.executable, fs_enc))
         return os.path.join(base, u'locale')
     else:
         if base is None:
-            base = os.path.dirname(unicode(__file__, sys.getfilesystemencoding()))
+            base = os.path.dirname(unicode(__file__, fs_enc))
         dirpath = os.path.realpath(os.path.join(base, u'locale'))
         if os.path.exists(dirpath):
             return dirpath
-        else:
-            return '/usr/share/locale'
+    return os.path.join(unicode(sys.prefix, fs_enc), u"share", u"locale")
 
 
 def _check_win32_locale():

=== modified file 'bzrlib/tests/__init__.py'
--- bzrlib/tests/__init__.py	2012-03-13 09:07:18 +0000
+++ bzrlib/tests/__init__.py	2012-04-30 10:00:30 +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_setup.py'
--- bzrlib/tests/test_setup.py	2011-01-12 01:01:53 +0000
+++ bzrlib/tests/test_setup.py	2012-04-30 10:00:30 +0000
@@ -21,19 +21,15 @@
 import subprocess
 
 import bzrlib
-from bzrlib.tests import TestCase, TestSkipped
-import bzrlib.osutils as osutils
+from bzrlib import tests
 
-# XXX: This clobbers the build directory in the real source tree; it'd be nice
-# to avoid that.
-#
 # TODO: Run bzr from the installed copy to see if it works.  Really we need to
 # run something that exercises every module, just starting it may not detect
 # some missing modules.
 #
 # TODO: Check that the version numbers are in sync.  (Or avoid this...)
 
-class TestSetup(TestCase):
+class TestSetup(tests.TestCaseInTempDir):
 
     def test_build_and_install(self):
         """ test cmd `python setup.py build`
@@ -45,30 +41,29 @@
         # are not necessarily invoked from there
         self.source_dir = os.path.dirname(os.path.dirname(bzrlib.__file__))
         if not os.path.isfile(os.path.join(self.source_dir, 'setup.py')):
-            raise TestSkipped(
+            self.skip(
                 'There is no setup.py file adjacent to the bzrlib directory')
         try:
             import distutils.sysconfig
             makefile_path = distutils.sysconfig.get_makefile_filename()
             if not os.path.exists(makefile_path):
-                raise TestSkipped(
+                self.skip(
                     'You must have the python Makefile installed to run this'
                     ' test. Usually this can be found by installing'
                     ' "python-dev"')
         except ImportError:
-            raise TestSkipped(
+            self.skip(
                 'You must have distutils installed to run this test.'
                 ' Usually this can be found by installing "python-dev"')
-        self.log('test_build running in %s' % os.getcwd())
-        root_dir = osutils.mkdtemp()
-        try:
-            self.run_setup(['clean'])
-            # build is implied by install
-            ## self.run_setup(['build'])
-            self.run_setup(['install', '--root', root_dir])
-            self.run_setup(['clean'])
-        finally:
-            osutils.rmtree(root_dir)
+        self.log('test_build running from %s' % self.source_dir)
+        build_dir = os.path.join(self.test_dir, "build")
+        install_dir = os.path.join(self.test_dir, "install")
+        self.run_setup([
+            'build', '-b', build_dir,
+            'install', '--root', install_dir])
+        # Install layout is platform dependant
+        self.assertPathExists(install_dir)
+        self.run_setup(['clean', '-b', build_dir])
 
     def run_setup(self, args):
         args = [sys.executable, './setup.py', ] + args

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- doc/en/release-notes/bzr-2.5.txt	2012-04-16 11:08:11 +0000
+++ doc/en/release-notes/bzr-2.5.txt	2012-04-30 10:00:30 +0000
@@ -77,6 +77,9 @@
 * Add support for pyftpdlib >= 0.7.0 and drop support for previous pyftpdlib
   versions. (Vincent Ladeuil, #956027)
 
+* Run smoketest for setup.py isolated in a tempdir. (Martin Packman, #140874)
+
+
 bzr 2.5.0
 #########