Merged revisions 72636 via svnmerge from

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

........
  r72636 | tarek.ziade | 2009-05-14 22:14:13 +0200 (Thu, 14 May 2009) | 1 line

  #6022 fixed test_get_outputs so it doesn't leaves a test file in the cwd
........

diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py
index 64ca6505c167cb337863cf6aa108b30a525f9e53..6a463c01174dd71cf84ce1adc8c61fd9906f78f2 100644 (file)
--- a/Lib/distutils/tests/test_build_ext.py
+++ b/Lib/distutils/tests/test_build_ext.py
@@ -312,12 +312,18 @@ class BuildExtTestCase(TempdirManager,
 
         # issue #5977 : distutils build_ext.get_outputs
         # returns wrong result with --inplace
-        cmd.inplace = 1
-        cmd.run()
-        so_file = cmd.get_outputs()[0]
+        other_tmp_dir = os.path.realpath(self.mkdtemp())
+        old_wd = os.getcwd()
+        os.chdir(other_tmp_dir)
+        try:
+            cmd.inplace = 1
+            cmd.run()
+            so_file = cmd.get_outputs()[0]
+        finally:
+            os.chdir(old_wd)
         self.assert_(os.path.exists(so_file))
         so_dir = os.path.dirname(so_file)
-        self.assertEquals(so_dir, os.getcwd())
+        self.assertEquals(so_dir, other_tmp_dir)
 
         cmd.inplace = 0
         cmd.run()

diff --git a/Misc/NEWS b/Misc/NEWS
index d8ba4c54f0b74bf5826415593c80a671a13b64ae..b80f7b3e267ab03cc698123a5e3e300e22873673 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -607,6 +607,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #6022: a test file was created in the current working directory by
+  test_get_outputs in Distutils.
+
 - Issue #5977: distutils build_ext.get_outputs was not taking into account the
   inplace option. Initial patch by kxroberto.