[Python-checkins] r76220 - in python/branches/release31-maint: Lib/test/test_tarfile.py Misc/NEWS
antoine.pitrou
python-checkins at python.org
Wed Nov 11 22:01:34 CET 2009
Author: antoine.pitrou
Date: Wed Nov 11 22:01:33 2009
New Revision: 76220
Log:
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.
........
................
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/Lib/test/test_tarfile.py
python/branches/release31-maint/Misc/NEWS
Modified: python/branches/release31-maint/Lib/test/test_tarfile.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_tarfile.py (original)
+++ python/branches/release31-maint/Lib/test/test_tarfile.py Wed Nov 11 22:01:33 2009
@@ -26,11 +26,8 @@
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 @@
def test_main():
- if not os.path.exists(TEMPDIR):
- os.mkdir(TEMPDIR)
+ os.makedirs(TEMPDIR)
tests = [
UstarReadTest,
Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS (original)
+++ python/branches/release31-maint/Misc/NEWS Wed Nov 11 22:01:33 2009
@@ -144,6 +144,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.
More information about the Python-checkins
mailing list