diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2009-11-11 21:01:33 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2009-11-11 21:01:33 (GMT) |
commit | b78ba6b3d052c933dc3f91d0ef5d639f94e7dd7e (patch) | |
tree | 2b06f710deaee641731cb5d614d512122ec473f9 /Lib | |
parent | ca5130cba373702931f4e5ffee973e446a6763cc (diff) | |
download | cpython-b78ba6b3d052c933dc3f91d0ef5d639f94e7dd7e.zip cpython-b78ba6b3d052c933dc3f91d0ef5d639f94e7dd7e.tar.gz cpython-b78ba6b3d052c933dc3f91d0ef5d639f94e7dd7e.tar.bz2 |
Merged revisions 76219 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r76219 | antoine.pitrou | 2009-11-11 21:59:38 +0100 (mer., 11 nov. 2009) | 9 lines
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.
........
................
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/test/test_tarfile.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py index 76390c7..d0dd71e 100644 --- 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") @@ -1146,8 +1143,7 @@ class Bz2PartialReadTest(unittest.TestCase): def test_main(): - if not os.path.exists(TEMPDIR): - os.mkdir(TEMPDIR) + os.makedirs(TEMPDIR) tests = [ UstarReadTest, |