Merged revisions 76217 via svnmerge from

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

........
  r76217 | antoine.pitrou | 2009-11-11 21:55:07 +0100 (mer., 11 nov. 2009) | 3 lines

  Issue #7295: Do not use a hardcoded file name in test_tarfile.
........

diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
index e916879ba4be39ad8af0906679d863db54fadce9..551d098ec90734a6c5202f56a5ef77602a031482 100644 (file)
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -26,11 +26,8 @@ except ImportError:
 def md5sum(data):
     return md5(data).hexdigest()
 
-def path(path):
-    return support.findfile(path)
-
-TEMPDIR = os.path.join(tempfile.gettempdir(), "test_tarfile_tmp")
-tarname = path("testtar.tar")
+TEMPDIR = os.path.abspath(support.TESTFN)
+tarname = support.findfile("testtar.tar")
 gzipname = os.path.join(TEMPDIR, "testtar.tar.gz")
 bz2name = os.path.join(TEMPDIR, "testtar.tar.bz2")
 tmpname = os.path.join(TEMPDIR, "tmp.tar")
@@ -1244,8 +1241,7 @@ class Bz2PartialReadTest(unittest.TestCase):
 
 
 def test_main():
-    if not os.path.exists(TEMPDIR):
-        os.mkdir(TEMPDIR)
+    os.makedirs(TEMPDIR)
 
     tests = [
         UstarReadTest,

diff --git a/Misc/NEWS b/Misc/NEWS
index cf62a99761b11cd20a8b5929a930d628fec811c8..2d30d504d65cdbf31d2c6ed90d754adb36f90a0f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -373,6 +373,8 @@ Documentation
 Tests
 -----
 
+- Issue #7295: Do not use a hardcoded file name in test_tarfile.
+
 - Issue #7270: Add some dedicated unit tests for multi-thread synchronization
   primitives such as Lock, RLock, Condition, Event and Semaphore.