From: Lars Gustäbel <lars@gustaebel.de>
Date: Mon, 23 Nov 2009 15:48:33 +0000 (+0000)
Subject: Merged revisions 76452 via svnmerge from
X-Git-Tag: v3.2a1~2140
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b7f09238d8599188a3278fd251914dbb67e0eb8a;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 76452 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76452 | lars.gustaebel | 2009-11-23 16:46:19 +0100 (Mon, 23 Nov 2009) | 3 lines

  Add a testcase that checks if the TarFile constructor successfully
  closes the internal file object in case of an error (issue #7341).
........
---

diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
index 5719f08e34e5..dfa555397c35 100644
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -309,6 +309,24 @@ class MiscReadTest(CommonReadTest):
             self.assertEqual(tarinfo.mtime, os.path.getmtime(path))
         tar.close()
 
+    def test_init_close_fobj(self):
+        # Issue #7341: Close the internal file object in the TarFile
+        # constructor in case of an error. For the test we rely on
+        # the fact that opening an empty file raises a ReadError.
+        empty = os.path.join(TEMPDIR, "empty")
+        open(empty, "wb").write(b"")
+
+        try:
+            tar = object.__new__(tarfile.TarFile)
+            try:
+                tar.__init__(empty)
+            except tarfile.ReadError:
+                self.assertTrue(tar.fileobj.closed)
+            else:
+                self.fail("ReadError not raised")
+        finally:
+            os.remove(empty)
+
 
 class StreamReadTest(CommonReadTest):