Issue #16645: Fix hardlink extracting test for tarfile.
This commit is contained in:
parent
14e27d896f
commit
421489f8a6
|
@ -297,25 +297,20 @@ class MiscReadTest(CommonReadTest):
|
|||
|
||||
def test_extract_hardlink(self):
|
||||
# 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:
|
||||
tar.extract("ustar/regtype", TEMPDIR)
|
||||
try:
|
||||
tar.extract("ustar/lnktype", TEMPDIR)
|
||||
except EnvironmentError, e:
|
||||
if e.errno == errno.ENOENT:
|
||||
self.fail("hardlink not extracted properly")
|
||||
self.addCleanup(os.remove, os.path.join(TEMPDIR, "ustar/regtype"))
|
||||
|
||||
data = open(os.path.join(TEMPDIR, "ustar/lnktype"), "rb").read()
|
||||
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:
|
||||
data = f.read()
|
||||
self.assertEqual(md5sum(data), md5_regtype)
|
||||
|
||||
try:
|
||||
tar.extract("ustar/symtype", TEMPDIR)
|
||||
except EnvironmentError, e:
|
||||
if e.errno == errno.ENOENT:
|
||||
self.fail("symlink not extracted properly")
|
||||
|
||||
data = open(os.path.join(TEMPDIR, "ustar/symtype"), "rb").read()
|
||||
self.addCleanup(os.remove, os.path.join(TEMPDIR, "ustar/symtype"))
|
||||
with open(os.path.join(TEMPDIR, "ustar/symtype"), "rb") as f:
|
||||
data = f.read()
|
||||
self.assertEqual(md5sum(data), md5_regtype)
|
||||
|
||||
def test_extractall(self):
|
||||
|
|
Loading…
Reference in New Issue