[Python-checkins] r76455 - in python/branches/release31-maint: Lib/test/test_tarfile.py

[lars.gustaebel]

Author: lars.gustaebel
Date: Mon Nov 23 17:04:57 2009
New Revision: 76455

Log:
Merged revisions 76453 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76453 | lars.gustaebel | 2009-11-23 16:48:33 +0100 (Mon, 23 Nov 2009) | 10 lines
  
  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).
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_tarfile.py

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	Mon Nov 23 17:04:57 2009
@@ -263,6 +263,24 @@
             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 invalid file raises a ReadError.
+        invalid = os.path.join(TEMPDIR, "invalid")
+        open(invalid, "wb").write(b"foo")
+
+        try:
+            tar = object.__new__(tarfile.TarFile)
+            try:
+                tar.__init__(invalid)
+            except tarfile.ReadError:
+                self.assertTrue(tar.fileobj.closed)
+            else:
+                self.fail("ReadError not raised")
+        finally:
+            os.remove(invalid)
+
 
 class StreamReadTest(ReadTest):