[Python-checkins] r76218 - in python/branches/release26-maint: Lib/test/test_tarfile.py Misc/NEWS

[antoine.pitrou]

Author: antoine.pitrou
Date: Wed Nov 11 21:57:55 2009
New Revision: 76218

Log:
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.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/test/test_tarfile.py
   python/branches/release26-maint/Misc/NEWS

Modified: python/branches/release26-maint/Lib/test/test_tarfile.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_tarfile.py	(original)
+++ python/branches/release26-maint/Lib/test/test_tarfile.py	Wed Nov 11 21:57:55 2009
@@ -27,11 +27,8 @@
 def md5sum(data):
     return md5(data).hexdigest()
 
-def path(path):
-    return test_support.findfile(path)
-
-TEMPDIR = os.path.join(tempfile.gettempdir(), "test_tarfile_tmp")
-tarname = path("testtar.tar")
+TEMPDIR = os.path.abspath(test_support.TESTFN)
+tarname = test_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")
@@ -1165,8 +1162,7 @@
 
 
 def test_main():
-    if not os.path.exists(TEMPDIR):
-        os.mkdir(TEMPDIR)
+    os.makedirs(TEMPDIR)
 
     tests = [
         UstarReadTest,

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Wed Nov 11 21:57:55 2009
@@ -77,6 +77,8 @@
 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.