traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #16645: Fix hardlink extracting test for tarfile.

This commit is contained in:
Serhiy Storchaka 2012-12-30 20:17:28 +02:00
parent 52280c427a 88339c44f8
commit 62c75f1e52
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Lib/test/test_tarfile.py
View File

@ -336,31 +336,21 @@ class MiscReadTest(CommonReadTest):
@support.skip_unless_symlink @support.skip_unless_symlink
def test_extract_hardlink(self): def test_extract_hardlink(self):
# Test hardlink extraction (e.g. bug #857297). # Test hardlink extraction (e.g. bug #857297).
tar = tarfile.open(tarname, errorlevel=1, encoding="iso8859-1") with tarfile.open(tarname, errorlevel=1, encoding="iso8859-1") as tar:
try:
tar.extract("ustar/regtype", TEMPDIR) tar.extract("ustar/regtype", TEMPDIR)
try: self.addCleanup(os.remove, os.path.join(TEMPDIR, "ustar/regtype"))
tar.extract("ustar/lnktype", TEMPDIR)
except EnvironmentError as e:
if e.errno == errno.ENOENT:
self.fail("hardlink not extracted properly")
tar.extract("ustar/lnktype", TEMPDIR)
self.addCleanup(os.remove, os.path.join(TEMPDIR, "ustar/lnktype"))
with open(os.path.join(TEMPDIR, "ustar/lnktype"), "rb") as f: with open(os.path.join(TEMPDIR, "ustar/lnktype"), "rb") as f:
data = f.read() data = f.read()
self.assertEqual(md5sum(data), md5_regtype) self.assertEqual(md5sum(data), md5_regtype)
try:
tar.extract("ustar/symtype", TEMPDIR) tar.extract("ustar/symtype", TEMPDIR)
except EnvironmentError as e: self.addCleanup(os.remove, os.path.join(TEMPDIR, "ustar/symtype"))
if e.errno == errno.ENOENT:
self.fail("symlink not extracted properly")
with open(os.path.join(TEMPDIR, "ustar/symtype"), "rb") as f: with open(os.path.join(TEMPDIR, "ustar/symtype"), "rb") as f:
data = f.read() data = f.read()
self.assertEqual(md5sum(data), md5_regtype) self.assertEqual(md5sum(data), md5_regtype)
finally:
tar.close()
def test_extractall(self): def test_extractall(self):
# Test if extractall() correctly restores directory permissions # Test if extractall() correctly restores directory permissions