Merged revisions 69602 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69602 | tarek.ziade | 2009-02-14 00:41:57 +0100 (Sat, 14 Feb 2009) | 1 line

  fix the environ for distutils test_util
........

diff --git a/Lib/distutils/tests/test_util.py b/Lib/distutils/tests/test_util.py
index 3505fe26e785761da5ad9a00a99534a94b79283b..ca586268a30fc4c50b092b368ac3b74e8b86ad74 100644 (file)
--- a/Lib/distutils/tests/test_util.py
+++ b/Lib/distutils/tests/test_util.py
@@ -35,11 +35,12 @@ class utilTestCase(unittest.TestCase):
         if hasattr(os, 'uname'):
             self.uname = os.uname
             self._uname = os.uname()
-            os.uname = self._get_uname
         else:
             self.uname = None
             self._uname = None
 
+        os.uname = self._get_uname
+
     def tearDown(self):
         # getting back tne environment
         os.name = self.name
@@ -91,6 +92,7 @@ class utilTestCase(unittest.TestCase):
                    ('Darwin Kernel Version 8.11.1: '
                     'Wed Oct 10 18:23:28 PDT 2007; '
                     'root:xnu-792.25.20~1/RELEASE_I386'), 'i386'))
+        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
 
         self.assertEquals(get_platform(), 'macosx-10.3-i386')
 
@@ -136,6 +138,9 @@ class utilTestCase(unittest.TestCase):
         def _isabs(path):
             return path[0] == '/'
         os.path.isabs = _isabs
+        def _join(*path):
+            return '/'.join(path)
+        os.path.join = _join
 
         self.assertEquals(change_root('/root', '/old/its/here'),
                           '/root/old/its/here')