mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk ........ r53012 | walter.doerwald | 2006-12-12 22:55:31 +0100 (Tue, 12 Dec 2006) | 2 lines Fix typo. ........ r53023 | brett.cannon | 2006-12-13 23:31:37 +0100 (Wed, 13 Dec 2006) | 2 lines Remove an unneeded import of 'warnings'. ........ r53025 | brett.cannon | 2006-12-14 00:02:38 +0100 (Thu, 14 Dec 2006) | 2 lines Remove unneeded imports of 'warnings'. ........ r53026 | brett.cannon | 2006-12-14 00:09:53 +0100 (Thu, 14 Dec 2006) | 4 lines Add test.test_support.guard_warnings_filter . This function returns a context manager that protects warnings.filter from being modified once the context is exited. ........ r53029 | george.yoshida | 2006-12-14 03:22:44 +0100 (Thu, 14 Dec 2006) | 2 lines Note that guard_warnings_filter was added in 2.6 ........ r53031 | vinay.sajip | 2006-12-14 09:53:55 +0100 (Thu, 14 Dec 2006) | 1 line Added news on recent changes to logging ........ r53032 | andrew.kuchling | 2006-12-14 19:57:53 +0100 (Thu, 14 Dec 2006) | 1 line [Patch #1599256 from David Watson] check that os.fsync is available before using it ........ r53042 | kurt.kaiser | 2006-12-15 06:13:11 +0100 (Fri, 15 Dec 2006) | 6 lines 1. Avoid hang when encountering a duplicate in a completion list. Bug 1571112. 2. Duplicate some old entries from Python's NEWS to IDLE's NEWS.txt M AutoCompleteWindow.py M NEWS.txt ........ r53048 | andrew.kuchling | 2006-12-18 18:12:31 +0100 (Mon, 18 Dec 2006) | 1 line [Bug #1618083] Add missing word; make a few grammar fixes ........ r53050 | andrew.kuchling | 2006-12-18 18:16:05 +0100 (Mon, 18 Dec 2006) | 1 line Bump version ........ r53051 | andrew.kuchling | 2006-12-18 18:22:07 +0100 (Mon, 18 Dec 2006) | 1 line [Bug #1616726] Fix description of generator.close(); if you raise some random exception, the exception is raised and doesn't trigger a RuntimeError ........ r53052 | andrew.kuchling | 2006-12-18 18:38:14 +0100 (Mon, 18 Dec 2006) | 1 line Describe new methods in Queue module ........ r53053 | andrew.kuchling | 2006-12-18 20:22:24 +0100 (Mon, 18 Dec 2006) | 1 line [Patch #1615868 by Lars Gustaebel] Use Py_off_t to fix BZ2File.seek() for offsets > 2Gb ........ r53057 | andrew.kuchling | 2006-12-18 22:29:07 +0100 (Mon, 18 Dec 2006) | 1 line Fix markup ........ r53063 | thomas.wouters | 2006-12-19 09:17:50 +0100 (Tue, 19 Dec 2006) | 5 lines Make sre's SubPattern objects accept slice objects like it already accepts simple slices. ........ r53065 | andrew.kuchling | 2006-12-19 15:13:05 +0100 (Tue, 19 Dec 2006) | 6 lines [Patch #1618455 by Ben Maurer] Improve speed of HMAC by using str.translate() instead of a more general XOR that has to construct a list. Slightly modified from Maurer's patch: the _strxor() function is no longer necessary at all. ........ r53066 | andrew.kuchling | 2006-12-19 15:28:23 +0100 (Tue, 19 Dec 2006) | 9 lines [Bug #1613651] Document socket.recv_into, socket.recvfrom_into Also, the text for recvfrom told you to read recv() for an explanation of the 'flags' argument, but recv() just pointed you at the man page. Copied the man-page text to recvfrom(), recvfrom_into, recv_into to avoid the pointless redirection. I don't have LaTeX on this machine; hope my markup is OK. ........ r53067 | andrew.kuchling | 2006-12-19 15:29:04 +0100 (Tue, 19 Dec 2006) | 1 line Comment typo ........ r53068 | andrew.kuchling | 2006-12-19 16:11:41 +0100 (Tue, 19 Dec 2006) | 1 line [Patch #1617413 from Dug Song] Fix HTTP Basic authentication via HTTPS ........ r53071 | andrew.kuchling | 2006-12-19 16:18:12 +0100 (Tue, 19 Dec 2006) | 1 line [Patch #1600491 from Jim Jewett] Describe how to build help files on Windows ........ r53073 | andrew.kuchling | 2006-12-19 16:43:10 +0100 (Tue, 19 Dec 2006) | 6 lines [Patch #1587139 by kxroberto] Protect lock acquisition/release with try...finally to ensure the lock is always released. This could use the 'with' statement, but the patch uses 'finally'. 2.5 backport candidate. ........ r53074 | vinay.sajip | 2006-12-19 19:29:11 +0100 (Tue, 19 Dec 2006) | 1 line Updated documentation for findCaller() to indicate that a 3-tuple is now returned, rather than a 2-tuple. ........ r53090 | georg.brandl | 2006-12-19 23:06:46 +0100 (Tue, 19 Dec 2006) | 3 lines Patch #1484695: The tarfile module now raises a HeaderError exception if a buffer given to frombuf() is invalid. ........ r53099 | raymond.hettinger | 2006-12-20 07:42:06 +0100 (Wed, 20 Dec 2006) | 5 lines Bug #1590891: random.randrange don't return correct value for big number Needs to be backported. ........ r53106 | georg.brandl | 2006-12-20 12:55:16 +0100 (Wed, 20 Dec 2006) | 3 lines Testcase for patch #1484695. ........ r53110 | andrew.kuchling | 2006-12-20 20:48:20 +0100 (Wed, 20 Dec 2006) | 17 lines [Apply length-checking.diff from bug #1599254] Add length checking to single-file mailbox formats: before doing a flush() on a mailbox, seek to the end and verify its length is unchanged, raising ExternalClashError if the file's length has changed. This fix avoids potential data loss if some other process appends to the mailbox file after the table of contents has been generated; instead of overwriting the modified file, you'll get the exception. I also noticed that the self._lookup() call in self.flush() wasn't necessary (everything that sets self._pending to True also calls self.lookup()), and replaced it by an assertion. 2.5 backport candidate. ........ r53112 | andrew.kuchling | 2006-12-20 20:57:10 +0100 (Wed, 20 Dec 2006) | 1 line [Bug #1619674] Make sum() use the term iterable, not sequence ........ r53113 | andrew.kuchling | 2006-12-20 20:58:11 +0100 (Wed, 20 Dec 2006) | 1 line Two grammar fixes ........ r53115 | andrew.kuchling | 2006-12-20 21:11:12 +0100 (Wed, 20 Dec 2006) | 5 lines Some other built-in functions are described with 'sequence' arguments that should really be 'iterable'; this commit changes them. Did I miss any? Did I introduce any errors? ........ r53117 | andrew.kuchling | 2006-12-20 21:20:42 +0100 (Wed, 20 Dec 2006) | 1 line [Bug #1619680] in_dll() arguments are documented in the wrong order ........ r53120 | neal.norwitz | 2006-12-21 05:38:00 +0100 (Thu, 21 Dec 2006) | 1 line Lars asked for permission on on python-dev for work on tarfile.py ........ r53125 | andrew.kuchling | 2006-12-21 14:40:29 +0100 (Thu, 21 Dec 2006) | 1 line Mention the os.SEEK_* constants ........ r53129 | walter.doerwald | 2006-12-21 19:06:30 +0100 (Thu, 21 Dec 2006) | 2 lines Fix typo. ........ r53131 | thomas.heller | 2006-12-21 19:30:56 +0100 (Thu, 21 Dec 2006) | 3 lines Fix wrong markup of an argument in a method signature. Will backport. ........ r53137 | andrew.kuchling | 2006-12-22 01:50:56 +0100 (Fri, 22 Dec 2006) | 1 line Typo fix ........ r53139 | andrew.kuchling | 2006-12-22 14:25:02 +0100 (Fri, 22 Dec 2006) | 1 line [Bug #737202; fix from Titus Brown] Make CGIHTTPServer work for scripts in sub-directories ........ r53141 | andrew.kuchling | 2006-12-22 16:04:45 +0100 (Fri, 22 Dec 2006) | 6 lines [Bug #802128] Make the mode argument of dumbdbm actually work the way it's described, and add a test for it. 2.5 bugfix candidate, maybe; arguably this patch changes the API of dumbdbm and shouldn't be added in a point-release. ........ r53142 | andrew.kuchling | 2006-12-22 16:16:58 +0100 (Fri, 22 Dec 2006) | 6 lines [Bug #802128 continued] Modify mode depending on the process umask. Is there really no other way to read the umask than to set it? Hope this works on Windows... ........ r53145 | andrew.kuchling | 2006-12-22 17:43:26 +0100 (Fri, 22 Dec 2006) | 1 line [Bug #776202] Apply Walter Doerwald's patch to use text mode for encoded files ........ r53146 | andrew.kuchling | 2006-12-22 19:41:42 +0100 (Fri, 22 Dec 2006) | 9 lines [Patch #783050 from Patrick Lynch] The emulation of forkpty() is incorrect; the master should close the slave fd. Added a test to test_pty.py that reads from the master_fd after doing a pty.fork(); without the fix it hangs forever instead of raising an exception. (<crossing fingers for the buildbots>) 2.5 backport candidate. ........ r53147 | andrew.kuchling | 2006-12-22 20:06:16 +0100 (Fri, 22 Dec 2006) | 1 line [Patch #827559 from Chris Gonnerman] Make SimpleHTTPServer redirect when a directory URL is missing the trailing slash; this lets relative links work. ........ r53149 | andrew.kuchling | 2006-12-22 20:21:27 +0100 (Fri, 22 Dec 2006) | 1 line Darn; this test works when you run test_pty.py directly, but fails when regrtest runs it (the os.read() raises os.error). I can't figure out the cause, so am commenting out the test. ........ r53150 | andrew.kuchling | 2006-12-22 22:48:19 +0100 (Fri, 22 Dec 2006) | 1 line Frak; this test also fails ........ r53153 | lars.gustaebel | 2006-12-23 17:40:13 +0100 (Sat, 23 Dec 2006) | 5 lines Patch #1230446: tarfile.py: fix ExFileObject so that read() and tell() work correctly together with readline(). Will backport to 2.5. ........ r53155 | lars.gustaebel | 2006-12-23 18:57:23 +0100 (Sat, 23 Dec 2006) | 5 lines Patch #1262036: Prevent TarFiles from being added to themselves under certain conditions. Will backport to 2.5. ........ r53159 | andrew.kuchling | 2006-12-27 04:25:31 +0100 (Wed, 27 Dec 2006) | 4 lines [Part of patch #1182394] Move the HMAC blocksize to be a class-level constant; this allows changing it in a subclass. To accommodate this, copy() now uses __class__. Also add some text to a comment. ........ r53160 | andrew.kuchling | 2006-12-27 04:31:24 +0100 (Wed, 27 Dec 2006) | 1 line [Rest of patch #1182394] Add ._current() method so that we can use the written-in-C .hexdigest() method ........ r53161 | lars.gustaebel | 2006-12-27 11:30:46 +0100 (Wed, 27 Dec 2006) | 4 lines Patch #1504073: Fix tarfile.open() for mode "r" with a fileobj argument. Will backport to 2.5. ........ r53165 | neal.norwitz | 2006-12-28 05:39:20 +0100 (Thu, 28 Dec 2006) | 1 line Remove a stray (old) macro name left around (I guess) ........ r53188 | neal.norwitz | 2006-12-29 04:01:53 +0100 (Fri, 29 Dec 2006) | 1 line SF bug #1623890, fix argument name in docstring ........ r53200 | raymond.hettinger | 2006-12-30 05:01:17 +0100 (Sat, 30 Dec 2006) | 1 line For sets with cyclical reprs, emit an ellipsis instead of infinitely recursing. ........ r53232 | brett.cannon | 2007-01-04 01:23:49 +0100 (Thu, 04 Jan 2007) | 3 lines Add EnvironmentVarGuard to test.test_support. Provides a context manager to temporarily set or unset environment variables. ........ r53235 | neal.norwitz | 2007-01-04 07:25:31 +0100 (Thu, 04 Jan 2007) | 1 line SF #1627373, fix typo in CarbonEvt. ........ r53244 | raymond.hettinger | 2007-01-04 18:53:34 +0100 (Thu, 04 Jan 2007) | 1 line Fix stability of heapq's nlargest() and nsmallest(). ........ r53249 | martin.v.loewis | 2007-01-04 22:06:12 +0100 (Thu, 04 Jan 2007) | 3 lines Bug #1566280: Explicitly invoke threading._shutdown from Py_Main, to avoid relying on atexit. Will backport to 2.5. ........ r53252 | gregory.p.smith | 2007-01-05 02:59:42 +0100 (Fri, 05 Jan 2007) | 3 lines Support linking of the bsddb module against BerkeleyDB 4.5.x (will backport to 2.5) ........ r53253 | gregory.p.smith | 2007-01-05 03:06:17 +0100 (Fri, 05 Jan 2007) | 2 lines bump module version to match supported berkeleydb version ........ r53255 | neal.norwitz | 2007-01-05 06:25:22 +0100 (Fri, 05 Jan 2007) | 6 lines Prevent crash on shutdown which can occur if we are finalizing and the module dict has been cleared already and some object raises a warning (like in a __del__). Will backport. ........ r53258 | gregory.p.smith | 2007-01-05 08:21:35 +0100 (Fri, 05 Jan 2007) | 2 lines typo fix ........ r53260 | neal.norwitz | 2007-01-05 09:06:43 +0100 (Fri, 05 Jan 2007) | 1 line Add Collin Winter for access to update PEP 3107 ........ r53262 | andrew.kuchling | 2007-01-05 15:22:17 +0100 (Fri, 05 Jan 2007) | 1 line [Bug #1622533] Make docstrings raw strings because they contain control characters (\0, \1) ........ r53264 | andrew.kuchling | 2007-01-05 16:51:24 +0100 (Fri, 05 Jan 2007) | 1 line [Patch #1520904] Fix bsddb tests to write to the temp directory instead of the Lib/bsddb/test directory ........ r53279 | brett.cannon | 2007-01-05 22:45:09 +0100 (Fri, 05 Jan 2007) | 3 lines Silence a warning from gcc 4.0.1 by specifying a function's parameter list is 'void' instead of just a set of empty parentheses. ........ r53285 | raymond.hettinger | 2007-01-06 02:14:41 +0100 (Sat, 06 Jan 2007) | 2 lines SF# 1409443: Expand comment to cover the interaction between f->f_lasti and the PREDICT macros. ........ r53286 | anthony.baxter | 2007-01-06 05:45:54 +0100 (Sat, 06 Jan 2007) | 1 line update to (c) years to include 2007 ........ r53291 | neal.norwitz | 2007-01-06 22:24:35 +0100 (Sat, 06 Jan 2007) | 1 line Add Josiah to SF for maintaining asyncore/asynchat ........ r53293 | peter.astrand | 2007-01-07 09:53:46 +0100 (Sun, 07 Jan 2007) | 1 line Re-implemented fix for #1531862 once again, in a way that works with Python 2.2. Fixes bug #1603424. ........ r53295 | peter.astrand | 2007-01-07 15:34:16 +0100 (Sun, 07 Jan 2007) | 1 line Avoid O(N**2) bottleneck in _communicate_(). Fixes #1598181. ........ r53300 | raymond.hettinger | 2007-01-08 19:09:20 +0100 (Mon, 08 Jan 2007) | 1 line Fix zero-length corner case for iterating over a mutating deque. ........ r53301 | vinay.sajip | 2007-01-08 19:50:32 +0100 (Mon, 08 Jan 2007) | 4 lines Bare except clause removed from SMTPHandler.emit(). Now, only ImportError is trapped. Bare except clause removed from SocketHandler.createSocket(). Now, only socket.error is trapped. (SF #411881) ........ r53302 | vinay.sajip | 2007-01-08 19:51:46 +0100 (Mon, 08 Jan 2007) | 2 lines Bare except clause removed from LogRecord.__init__. Now, only ValueError, TypeError and AttributeError are trapped. (SF #411881) ........ r53303 | vinay.sajip | 2007-01-08 19:52:36 +0100 (Mon, 08 Jan 2007) | 1 line Added entries about removal of some bare except clauses from logging. ........
753 lines
23 KiB
Python
753 lines
23 KiB
Python
import sys
|
|
import os
|
|
import shutil
|
|
import tempfile
|
|
import StringIO
|
|
|
|
import unittest
|
|
import tarfile
|
|
|
|
from test import test_support
|
|
|
|
# Check for our compression modules.
|
|
try:
|
|
import gzip
|
|
gzip.GzipFile
|
|
except (ImportError, AttributeError):
|
|
gzip = None
|
|
try:
|
|
import bz2
|
|
except ImportError:
|
|
bz2 = None
|
|
|
|
def path(path):
|
|
return test_support.findfile(path)
|
|
|
|
testtar = path("testtar.tar")
|
|
tempdir = os.path.join(tempfile.gettempdir(), "testtar" + os.extsep + "dir")
|
|
tempname = test_support.TESTFN
|
|
membercount = 12
|
|
|
|
def tarname(comp=""):
|
|
if not comp:
|
|
return testtar
|
|
return os.path.join(tempdir, "%s%s%s" % (testtar, os.extsep, comp))
|
|
|
|
def dirname():
|
|
if not os.path.exists(tempdir):
|
|
os.mkdir(tempdir)
|
|
return tempdir
|
|
|
|
def tmpname():
|
|
return tempname
|
|
|
|
|
|
class BaseTest(unittest.TestCase):
|
|
comp = ''
|
|
mode = 'r'
|
|
sep = ':'
|
|
|
|
def setUp(self):
|
|
mode = self.mode + self.sep + self.comp
|
|
self.tar = tarfile.open(tarname(self.comp), mode)
|
|
|
|
def tearDown(self):
|
|
self.tar.close()
|
|
|
|
class ReadTest(BaseTest):
|
|
|
|
def test(self):
|
|
"""Test member extraction.
|
|
"""
|
|
members = 0
|
|
for tarinfo in self.tar:
|
|
members += 1
|
|
if not tarinfo.isreg():
|
|
continue
|
|
f = self.tar.extractfile(tarinfo)
|
|
self.assert_(len(f.read()) == tarinfo.size,
|
|
"size read does not match expected size")
|
|
f.close()
|
|
|
|
self.assert_(members == membercount,
|
|
"could not find all members")
|
|
|
|
def test_sparse(self):
|
|
"""Test sparse member extraction.
|
|
"""
|
|
if self.sep != "|":
|
|
f1 = self.tar.extractfile("S-SPARSE")
|
|
f2 = self.tar.extractfile("S-SPARSE-WITH-NULLS")
|
|
self.assert_(f1.read() == f2.read(),
|
|
"_FileObject failed on sparse file member")
|
|
|
|
def test_readlines(self):
|
|
"""Test readlines() method of _FileObject.
|
|
"""
|
|
if self.sep != "|":
|
|
filename = "0-REGTYPE-TEXT"
|
|
self.tar.extract(filename, dirname())
|
|
f = open(os.path.join(dirname(), filename), "rU")
|
|
lines1 = f.readlines()
|
|
f.close()
|
|
lines2 = self.tar.extractfile(filename).readlines()
|
|
self.assert_(lines1 == lines2,
|
|
"_FileObject.readline() does not work correctly")
|
|
|
|
def test_iter(self):
|
|
# Test iteration over ExFileObject.
|
|
if self.sep != "|":
|
|
filename = "0-REGTYPE-TEXT"
|
|
self.tar.extract(filename, dirname())
|
|
f = open(os.path.join(dirname(), filename), "rU")
|
|
lines1 = f.readlines()
|
|
f.close()
|
|
lines2 = [line for line in self.tar.extractfile(filename)]
|
|
self.assert_(lines1 == lines2,
|
|
"ExFileObject iteration does not work correctly")
|
|
|
|
def test_seek(self):
|
|
"""Test seek() method of _FileObject, incl. random reading.
|
|
"""
|
|
if self.sep != "|":
|
|
filename = "0-REGTYPE-TEXT"
|
|
self.tar.extract(filename, dirname())
|
|
f = open(os.path.join(dirname(), filename), "rb")
|
|
data = f.read()
|
|
f.close()
|
|
|
|
tarinfo = self.tar.getmember(filename)
|
|
fobj = self.tar.extractfile(tarinfo)
|
|
|
|
text = fobj.read()
|
|
fobj.seek(0)
|
|
self.assert_(0 == fobj.tell(),
|
|
"seek() to file's start failed")
|
|
fobj.seek(2048, 0)
|
|
self.assert_(2048 == fobj.tell(),
|
|
"seek() to absolute position failed")
|
|
fobj.seek(-1024, 1)
|
|
self.assert_(1024 == fobj.tell(),
|
|
"seek() to negative relative position failed")
|
|
fobj.seek(1024, 1)
|
|
self.assert_(2048 == fobj.tell(),
|
|
"seek() to positive relative position failed")
|
|
s = fobj.read(10)
|
|
self.assert_(s == data[2048:2058],
|
|
"read() after seek failed")
|
|
fobj.seek(0, 2)
|
|
self.assert_(tarinfo.size == fobj.tell(),
|
|
"seek() to file's end failed")
|
|
self.assert_(fobj.read() == "",
|
|
"read() at file's end did not return empty string")
|
|
fobj.seek(-tarinfo.size, 2)
|
|
self.assert_(0 == fobj.tell(),
|
|
"relative seek() to file's start failed")
|
|
fobj.seek(512)
|
|
s1 = fobj.readlines()
|
|
fobj.seek(512)
|
|
s2 = fobj.readlines()
|
|
self.assert_(s1 == s2,
|
|
"readlines() after seek failed")
|
|
fobj.seek(0)
|
|
self.assert_(len(fobj.readline()) == fobj.tell(),
|
|
"tell() after readline() failed")
|
|
fobj.seek(512)
|
|
self.assert_(len(fobj.readline()) + 512 == fobj.tell(),
|
|
"tell() after seek() and readline() failed")
|
|
fobj.seek(0)
|
|
line = fobj.readline()
|
|
self.assert_(fobj.read() == data[len(line):],
|
|
"read() after readline() failed")
|
|
fobj.close()
|
|
|
|
def test_old_dirtype(self):
|
|
"""Test old style dirtype member (bug #1336623).
|
|
"""
|
|
# Old tars create directory members using a REGTYPE
|
|
# header with a "/" appended to the filename field.
|
|
|
|
# Create an old tar style directory entry.
|
|
filename = tmpname()
|
|
tarinfo = tarfile.TarInfo("directory/")
|
|
tarinfo.type = tarfile.REGTYPE
|
|
|
|
fobj = open(filename, "w")
|
|
fobj.write(tarinfo.tobuf())
|
|
fobj.close()
|
|
|
|
try:
|
|
# Test if it is still a directory entry when
|
|
# read back.
|
|
tar = tarfile.open(filename)
|
|
tarinfo = tar.getmembers()[0]
|
|
tar.close()
|
|
|
|
self.assert_(tarinfo.type == tarfile.DIRTYPE)
|
|
self.assert_(tarinfo.name.endswith("/"))
|
|
finally:
|
|
try:
|
|
os.unlink(filename)
|
|
except:
|
|
pass
|
|
|
|
class ReadStreamTest(ReadTest):
|
|
sep = "|"
|
|
|
|
def test(self):
|
|
"""Test member extraction, and for StreamError when
|
|
seeking backwards.
|
|
"""
|
|
ReadTest.test(self)
|
|
tarinfo = self.tar.getmembers()[0]
|
|
f = self.tar.extractfile(tarinfo)
|
|
self.assertRaises(tarfile.StreamError, f.read)
|
|
|
|
def test_stream(self):
|
|
"""Compare the normal tar and the stream tar.
|
|
"""
|
|
stream = self.tar
|
|
tar = tarfile.open(tarname(), 'r')
|
|
|
|
while 1:
|
|
t1 = tar.next()
|
|
t2 = stream.next()
|
|
if t1 is None:
|
|
break
|
|
self.assert_(t2 is not None, "stream.next() failed.")
|
|
|
|
if t2.islnk() or t2.issym():
|
|
self.assertRaises(tarfile.StreamError, stream.extractfile, t2)
|
|
continue
|
|
v1 = tar.extractfile(t1)
|
|
v2 = stream.extractfile(t2)
|
|
if v1 is None:
|
|
continue
|
|
self.assert_(v2 is not None, "stream.extractfile() failed")
|
|
self.assert_(v1.read() == v2.read(), "stream extraction failed")
|
|
|
|
tar.close()
|
|
stream.close()
|
|
|
|
class ReadDetectTest(ReadTest):
|
|
|
|
def setUp(self):
|
|
self.tar = tarfile.open(tarname(self.comp), self.mode)
|
|
|
|
class ReadDetectFileobjTest(ReadTest):
|
|
|
|
def setUp(self):
|
|
name = tarname(self.comp)
|
|
self.tar = tarfile.open(name, mode=self.mode,
|
|
fileobj=open(name, "rb"))
|
|
|
|
class ReadAsteriskTest(ReadTest):
|
|
|
|
def setUp(self):
|
|
mode = self.mode + self.sep + "*"
|
|
self.tar = tarfile.open(tarname(self.comp), mode)
|
|
|
|
class ReadStreamAsteriskTest(ReadStreamTest):
|
|
|
|
def setUp(self):
|
|
mode = self.mode + self.sep + "*"
|
|
self.tar = tarfile.open(tarname(self.comp), mode)
|
|
|
|
class WriteTest(BaseTest):
|
|
mode = 'w'
|
|
|
|
def setUp(self):
|
|
mode = self.mode + self.sep + self.comp
|
|
self.src = tarfile.open(tarname(self.comp), 'r')
|
|
self.dstname = tmpname()
|
|
self.dst = tarfile.open(self.dstname, mode)
|
|
|
|
def tearDown(self):
|
|
self.src.close()
|
|
self.dst.close()
|
|
|
|
def test_posix(self):
|
|
self.dst.posix = 1
|
|
self._test()
|
|
|
|
def test_nonposix(self):
|
|
self.dst.posix = 0
|
|
self._test()
|
|
|
|
def test_small(self):
|
|
self.dst.add(os.path.join(os.path.dirname(__file__),"cfgparser.1"))
|
|
self.dst.close()
|
|
self.assertNotEqual(os.stat(self.dstname).st_size, 0)
|
|
|
|
def _test(self):
|
|
for tarinfo in self.src:
|
|
if not tarinfo.isreg():
|
|
continue
|
|
f = self.src.extractfile(tarinfo)
|
|
if self.dst.posix and len(tarinfo.name) > tarfile.LENGTH_NAME and "/" not in tarinfo.name:
|
|
self.assertRaises(ValueError, self.dst.addfile,
|
|
tarinfo, f)
|
|
else:
|
|
self.dst.addfile(tarinfo, f)
|
|
|
|
def test_add_self(self):
|
|
dstname = os.path.abspath(self.dstname)
|
|
|
|
self.assertEqual(self.dst.name, dstname, "archive name must be absolute")
|
|
|
|
self.dst.add(dstname)
|
|
self.assertEqual(self.dst.getnames(), [], "added the archive to itself")
|
|
|
|
cwd = os.getcwd()
|
|
os.chdir(dirname())
|
|
self.dst.add(dstname)
|
|
os.chdir(cwd)
|
|
self.assertEqual(self.dst.getnames(), [], "added the archive to itself")
|
|
|
|
|
|
class Write100Test(BaseTest):
|
|
# The name field in a tar header stores strings of at most 100 chars.
|
|
# If a string is shorter than 100 chars it has to be padded with '\0',
|
|
# which implies that a string of exactly 100 chars is stored without
|
|
# a trailing '\0'.
|
|
|
|
def setUp(self):
|
|
self.name = "01234567890123456789012345678901234567890123456789"
|
|
self.name += "01234567890123456789012345678901234567890123456789"
|
|
|
|
self.tar = tarfile.open(tmpname(), "w")
|
|
t = tarfile.TarInfo(self.name)
|
|
self.tar.addfile(t)
|
|
self.tar.close()
|
|
|
|
self.tar = tarfile.open(tmpname())
|
|
|
|
def tearDown(self):
|
|
self.tar.close()
|
|
|
|
def test(self):
|
|
self.assertEqual(self.tar.getnames()[0], self.name,
|
|
"failed to store 100 char filename")
|
|
|
|
|
|
class WriteSize0Test(BaseTest):
|
|
mode = 'w'
|
|
|
|
def setUp(self):
|
|
self.tmpdir = dirname()
|
|
self.dstname = tmpname()
|
|
self.dst = tarfile.open(self.dstname, "w")
|
|
|
|
def tearDown(self):
|
|
self.dst.close()
|
|
|
|
def test_file(self):
|
|
path = os.path.join(self.tmpdir, "file")
|
|
f = open(path, "w")
|
|
f.close()
|
|
tarinfo = self.dst.gettarinfo(path)
|
|
self.assertEqual(tarinfo.size, 0)
|
|
f = open(path, "w")
|
|
f.write("aaa")
|
|
f.close()
|
|
tarinfo = self.dst.gettarinfo(path)
|
|
self.assertEqual(tarinfo.size, 3)
|
|
|
|
def test_directory(self):
|
|
path = os.path.join(self.tmpdir, "directory")
|
|
if os.path.exists(path):
|
|
# This shouldn't be necessary, but is <wink> if a previous
|
|
# run was killed in mid-stream.
|
|
shutil.rmtree(path)
|
|
os.mkdir(path)
|
|
tarinfo = self.dst.gettarinfo(path)
|
|
self.assertEqual(tarinfo.size, 0)
|
|
|
|
def test_symlink(self):
|
|
if hasattr(os, "symlink"):
|
|
path = os.path.join(self.tmpdir, "symlink")
|
|
os.symlink("link_target", path)
|
|
tarinfo = self.dst.gettarinfo(path)
|
|
self.assertEqual(tarinfo.size, 0)
|
|
|
|
|
|
class WriteStreamTest(WriteTest):
|
|
sep = '|'
|
|
|
|
def test_padding(self):
|
|
self.dst.close()
|
|
|
|
if self.comp == "gz":
|
|
f = gzip.GzipFile(self.dstname)
|
|
s = f.read()
|
|
f.close()
|
|
elif self.comp == "bz2":
|
|
f = bz2.BZ2Decompressor()
|
|
s = open(self.dstname).read()
|
|
s = f.decompress(s)
|
|
self.assertEqual(len(f.unused_data), 0, "trailing data")
|
|
else:
|
|
f = open(self.dstname)
|
|
s = f.read()
|
|
f.close()
|
|
|
|
self.assertEqual(s.count("\0"), tarfile.RECORDSIZE,
|
|
"incorrect zero padding")
|
|
|
|
|
|
class WriteGNULongTest(unittest.TestCase):
|
|
"""This testcase checks for correct creation of GNU Longname
|
|
and Longlink extensions.
|
|
|
|
It creates a tarfile and adds empty members with either
|
|
long names, long linknames or both and compares the size
|
|
of the tarfile with the expected size.
|
|
|
|
It checks for SF bug #812325 in TarFile._create_gnulong().
|
|
|
|
While I was writing this testcase, I noticed a second bug
|
|
in the same method:
|
|
Long{names,links} weren't null-terminated which lead to
|
|
bad tarfiles when their length was a multiple of 512. This
|
|
is tested as well.
|
|
"""
|
|
|
|
def _length(self, s):
|
|
blocks, remainder = divmod(len(s) + 1, 512)
|
|
if remainder:
|
|
blocks += 1
|
|
return blocks * 512
|
|
|
|
def _calc_size(self, name, link=None):
|
|
# initial tar header
|
|
count = 512
|
|
|
|
if len(name) > tarfile.LENGTH_NAME:
|
|
# gnu longname extended header + longname
|
|
count += 512
|
|
count += self._length(name)
|
|
|
|
if link is not None and len(link) > tarfile.LENGTH_LINK:
|
|
# gnu longlink extended header + longlink
|
|
count += 512
|
|
count += self._length(link)
|
|
|
|
return count
|
|
|
|
def _test(self, name, link=None):
|
|
tarinfo = tarfile.TarInfo(name)
|
|
if link:
|
|
tarinfo.linkname = link
|
|
tarinfo.type = tarfile.LNKTYPE
|
|
|
|
tar = tarfile.open(tmpname(), "w")
|
|
tar.posix = False
|
|
tar.addfile(tarinfo)
|
|
|
|
v1 = self._calc_size(name, link)
|
|
v2 = tar.offset
|
|
self.assertEqual(v1, v2, "GNU longname/longlink creation failed")
|
|
|
|
tar.close()
|
|
|
|
tar = tarfile.open(tmpname())
|
|
member = tar.next()
|
|
self.failIf(member is None, "unable to read longname member")
|
|
self.assert_(tarinfo.name == member.name and \
|
|
tarinfo.linkname == member.linkname, \
|
|
"unable to read longname member")
|
|
|
|
def test_longname_1023(self):
|
|
self._test(("longnam/" * 127) + "longnam")
|
|
|
|
def test_longname_1024(self):
|
|
self._test(("longnam/" * 127) + "longname")
|
|
|
|
def test_longname_1025(self):
|
|
self._test(("longnam/" * 127) + "longname_")
|
|
|
|
def test_longlink_1023(self):
|
|
self._test("name", ("longlnk/" * 127) + "longlnk")
|
|
|
|
def test_longlink_1024(self):
|
|
self._test("name", ("longlnk/" * 127) + "longlink")
|
|
|
|
def test_longlink_1025(self):
|
|
self._test("name", ("longlnk/" * 127) + "longlink_")
|
|
|
|
def test_longnamelink_1023(self):
|
|
self._test(("longnam/" * 127) + "longnam",
|
|
("longlnk/" * 127) + "longlnk")
|
|
|
|
def test_longnamelink_1024(self):
|
|
self._test(("longnam/" * 127) + "longname",
|
|
("longlnk/" * 127) + "longlink")
|
|
|
|
def test_longnamelink_1025(self):
|
|
self._test(("longnam/" * 127) + "longname_",
|
|
("longlnk/" * 127) + "longlink_")
|
|
|
|
class ReadGNULongTest(unittest.TestCase):
|
|
|
|
def setUp(self):
|
|
self.tar = tarfile.open(tarname())
|
|
|
|
def tearDown(self):
|
|
self.tar.close()
|
|
|
|
def test_1471427(self):
|
|
"""Test reading of longname (bug #1471427).
|
|
"""
|
|
name = "test/" * 20 + "0-REGTYPE"
|
|
try:
|
|
tarinfo = self.tar.getmember(name)
|
|
except KeyError:
|
|
tarinfo = None
|
|
self.assert_(tarinfo is not None, "longname not found")
|
|
self.assert_(tarinfo.type != tarfile.DIRTYPE, "read longname as dirtype")
|
|
|
|
def test_read_name(self):
|
|
name = ("0-LONGNAME-" * 10)[:101]
|
|
try:
|
|
tarinfo = self.tar.getmember(name)
|
|
except KeyError:
|
|
tarinfo = None
|
|
self.assert_(tarinfo is not None, "longname not found")
|
|
|
|
def test_read_link(self):
|
|
link = ("1-LONGLINK-" * 10)[:101]
|
|
name = ("0-LONGNAME-" * 10)[:101]
|
|
try:
|
|
tarinfo = self.tar.getmember(link)
|
|
except KeyError:
|
|
tarinfo = None
|
|
self.assert_(tarinfo is not None, "longlink not found")
|
|
self.assert_(tarinfo.linkname == name, "linkname wrong")
|
|
|
|
def test_truncated_longname(self):
|
|
f = open(tarname())
|
|
fobj = StringIO.StringIO(f.read(1024))
|
|
f.close()
|
|
tar = tarfile.open(name="foo.tar", fileobj=fobj)
|
|
self.assert_(len(tar.getmembers()) == 0, "")
|
|
tar.close()
|
|
|
|
|
|
class ExtractHardlinkTest(BaseTest):
|
|
|
|
def test_hardlink(self):
|
|
"""Test hardlink extraction (bug #857297)
|
|
"""
|
|
# Prevent errors from being caught
|
|
self.tar.errorlevel = 1
|
|
|
|
self.tar.extract("0-REGTYPE", dirname())
|
|
try:
|
|
# Extract 1-LNKTYPE which is a hardlink to 0-REGTYPE
|
|
self.tar.extract("1-LNKTYPE", dirname())
|
|
except EnvironmentError, e:
|
|
import errno
|
|
if e.errno == errno.ENOENT:
|
|
self.fail("hardlink not extracted properly")
|
|
|
|
class CreateHardlinkTest(BaseTest):
|
|
"""Test the creation of LNKTYPE (hardlink) members in an archive.
|
|
In this respect tarfile.py mimics the behaviour of GNU tar: If
|
|
a file has a st_nlink > 1, it will be added a REGTYPE member
|
|
only the first time.
|
|
"""
|
|
|
|
def setUp(self):
|
|
self.tar = tarfile.open(tmpname(), "w")
|
|
|
|
self.foo = os.path.join(dirname(), "foo")
|
|
self.bar = os.path.join(dirname(), "bar")
|
|
|
|
if os.path.exists(self.foo):
|
|
os.remove(self.foo)
|
|
if os.path.exists(self.bar):
|
|
os.remove(self.bar)
|
|
|
|
f = open(self.foo, "w")
|
|
f.write("foo")
|
|
f.close()
|
|
self.tar.add(self.foo)
|
|
|
|
def test_add_twice(self):
|
|
# If st_nlink == 1 then the same file will be added as
|
|
# REGTYPE every time.
|
|
tarinfo = self.tar.gettarinfo(self.foo)
|
|
self.assertEqual(tarinfo.type, tarfile.REGTYPE,
|
|
"add file as regular failed")
|
|
|
|
def test_add_hardlink(self):
|
|
# If st_nlink > 1 then the same file will be added as
|
|
# LNKTYPE.
|
|
os.link(self.foo, self.bar)
|
|
tarinfo = self.tar.gettarinfo(self.foo)
|
|
self.assertEqual(tarinfo.type, tarfile.LNKTYPE,
|
|
"add file as hardlink failed")
|
|
|
|
tarinfo = self.tar.gettarinfo(self.bar)
|
|
self.assertEqual(tarinfo.type, tarfile.LNKTYPE,
|
|
"add file as hardlink failed")
|
|
|
|
def test_dereference_hardlink(self):
|
|
self.tar.dereference = True
|
|
os.link(self.foo, self.bar)
|
|
tarinfo = self.tar.gettarinfo(self.bar)
|
|
self.assertEqual(tarinfo.type, tarfile.REGTYPE,
|
|
"dereferencing hardlink failed")
|
|
|
|
|
|
# Gzip TestCases
|
|
class ReadTestGzip(ReadTest):
|
|
comp = "gz"
|
|
class ReadStreamTestGzip(ReadStreamTest):
|
|
comp = "gz"
|
|
class WriteTestGzip(WriteTest):
|
|
comp = "gz"
|
|
class WriteStreamTestGzip(WriteStreamTest):
|
|
comp = "gz"
|
|
class ReadDetectTestGzip(ReadDetectTest):
|
|
comp = "gz"
|
|
class ReadDetectFileobjTestGzip(ReadDetectFileobjTest):
|
|
comp = "gz"
|
|
class ReadAsteriskTestGzip(ReadAsteriskTest):
|
|
comp = "gz"
|
|
class ReadStreamAsteriskTestGzip(ReadStreamAsteriskTest):
|
|
comp = "gz"
|
|
|
|
# Filemode test cases
|
|
|
|
class FileModeTest(unittest.TestCase):
|
|
def test_modes(self):
|
|
self.assertEqual(tarfile.filemode(0755), '-rwxr-xr-x')
|
|
self.assertEqual(tarfile.filemode(07111), '---s--s--t')
|
|
|
|
class HeaderErrorTest(unittest.TestCase):
|
|
|
|
def test_truncated_header(self):
|
|
self.assertRaises(tarfile.HeaderError, tarfile.TarInfo.frombuf, "")
|
|
self.assertRaises(tarfile.HeaderError, tarfile.TarInfo.frombuf, "filename\0")
|
|
self.assertRaises(tarfile.HeaderError, tarfile.TarInfo.frombuf, "\0" * 511)
|
|
self.assertRaises(tarfile.HeaderError, tarfile.TarInfo.frombuf, "\0" * 513)
|
|
|
|
def test_empty_header(self):
|
|
self.assertRaises(tarfile.HeaderError, tarfile.TarInfo.frombuf, "\0" * 512)
|
|
|
|
def test_invalid_header(self):
|
|
buf = tarfile.TarInfo("filename").tobuf()
|
|
buf = buf[:148] + "foo\0\0\0\0\0" + buf[156:] # invalid number field.
|
|
self.assertRaises(tarfile.HeaderError, tarfile.TarInfo.frombuf, buf)
|
|
|
|
def test_bad_checksum(self):
|
|
buf = tarfile.TarInfo("filename").tobuf()
|
|
b = buf[:148] + " " + buf[156:] # clear the checksum field.
|
|
self.assertRaises(tarfile.HeaderError, tarfile.TarInfo.frombuf, b)
|
|
b = "a" + buf[1:] # manipulate the buffer, so checksum won't match.
|
|
self.assertRaises(tarfile.HeaderError, tarfile.TarInfo.frombuf, b)
|
|
|
|
class OpenFileobjTest(BaseTest):
|
|
# Test for SF bug #1496501.
|
|
|
|
def test_opener(self):
|
|
fobj = StringIO.StringIO("foo\n")
|
|
try:
|
|
tarfile.open("", "r", fileobj=fobj)
|
|
except tarfile.ReadError:
|
|
self.assertEqual(fobj.tell(), 0, "fileobj's position has moved")
|
|
|
|
if bz2:
|
|
# Bzip2 TestCases
|
|
class ReadTestBzip2(ReadTestGzip):
|
|
comp = "bz2"
|
|
class ReadStreamTestBzip2(ReadStreamTestGzip):
|
|
comp = "bz2"
|
|
class WriteTestBzip2(WriteTest):
|
|
comp = "bz2"
|
|
class WriteStreamTestBzip2(WriteStreamTestGzip):
|
|
comp = "bz2"
|
|
class ReadDetectTestBzip2(ReadDetectTest):
|
|
comp = "bz2"
|
|
class ReadDetectFileobjTestBzip2(ReadDetectFileobjTest):
|
|
comp = "bz2"
|
|
class ReadAsteriskTestBzip2(ReadAsteriskTest):
|
|
comp = "bz2"
|
|
class ReadStreamAsteriskTestBzip2(ReadStreamAsteriskTest):
|
|
comp = "bz2"
|
|
|
|
# If importing gzip failed, discard the Gzip TestCases.
|
|
if not gzip:
|
|
del ReadTestGzip
|
|
del ReadStreamTestGzip
|
|
del WriteTestGzip
|
|
del WriteStreamTestGzip
|
|
|
|
def test_main():
|
|
# Create archive.
|
|
f = open(tarname(), "rb")
|
|
fguts = f.read()
|
|
f.close()
|
|
if gzip:
|
|
# create testtar.tar.gz
|
|
tar = gzip.open(tarname("gz"), "wb")
|
|
tar.write(fguts)
|
|
tar.close()
|
|
if bz2:
|
|
# create testtar.tar.bz2
|
|
tar = bz2.BZ2File(tarname("bz2"), "wb")
|
|
tar.write(fguts)
|
|
tar.close()
|
|
|
|
tests = [
|
|
FileModeTest,
|
|
HeaderErrorTest,
|
|
OpenFileobjTest,
|
|
ReadTest,
|
|
ReadStreamTest,
|
|
ReadDetectTest,
|
|
ReadDetectFileobjTest,
|
|
ReadAsteriskTest,
|
|
ReadStreamAsteriskTest,
|
|
WriteTest,
|
|
Write100Test,
|
|
WriteSize0Test,
|
|
WriteStreamTest,
|
|
WriteGNULongTest,
|
|
ReadGNULongTest,
|
|
]
|
|
|
|
if hasattr(os, "link"):
|
|
tests.append(ExtractHardlinkTest)
|
|
tests.append(CreateHardlinkTest)
|
|
|
|
if gzip:
|
|
tests.extend([
|
|
ReadTestGzip, ReadStreamTestGzip,
|
|
WriteTestGzip, WriteStreamTestGzip,
|
|
ReadDetectTestGzip, ReadDetectFileobjTestGzip,
|
|
ReadAsteriskTestGzip, ReadStreamAsteriskTestGzip
|
|
])
|
|
|
|
if bz2:
|
|
tests.extend([
|
|
ReadTestBzip2, ReadStreamTestBzip2,
|
|
WriteTestBzip2, WriteStreamTestBzip2,
|
|
ReadDetectTestBzip2, ReadDetectFileobjTestBzip2,
|
|
ReadAsteriskTestBzip2, ReadStreamAsteriskTestBzip2
|
|
])
|
|
try:
|
|
test_support.run_unittest(*tests)
|
|
finally:
|
|
if gzip:
|
|
os.remove(tarname("gz"))
|
|
if bz2:
|
|
os.remove(tarname("bz2"))
|
|
if os.path.exists(dirname()):
|
|
shutil.rmtree(dirname())
|
|
if os.path.exists(tmpname()):
|
|
os.remove(tmpname())
|
|
|
|
if __name__ == "__main__":
|
|
test_main()
|