From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 25 Feb 2016 10:55:19 +0000 (+0200)
Subject: Issue #25801: Fixed resource warnings in test_zipfile64.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee7fe38d401e20fed8d0cf5d02e9dc6a21fa2013;p=python

Issue #25801: Fixed resource warnings in test_zipfile64.
Patch by SilentGhost.
---

diff --git a/Lib/test/test_zipfile64.py b/Lib/test/test_zipfile64.py
index a87baaa899..151baf2302 100644
--- a/Lib/test/test_zipfile64.py
+++ b/Lib/test/test_zipfile64.py
@@ -79,15 +79,19 @@ class TestsWithSourceFile(unittest.TestCase):
     def testStored(self):
         # Try the temp file first.  If we do TESTFN2 first, then it hogs
         # gigabytes of disk space for the duration of the test.
-        for f in TemporaryFile(), TESTFN2:
+        with TemporaryFile() as f:
             self.zipTest(f, zipfile.ZIP_STORED)
+            self.assertFalse(f.closed)
+        self.zipTest(TESTFN2, zipfile.ZIP_STORED)
 
-    if zlib:
-        def testDeflated(self):
-            # Try the temp file first.  If we do TESTFN2 first, then it hogs
-            # gigabytes of disk space for the duration of the test.
-            for f in TemporaryFile(), TESTFN2:
-                self.zipTest(f, zipfile.ZIP_DEFLATED)
+    @unittest.skipUnless(zlib, "requires zlib")
+    def testDeflated(self):
+        # Try the temp file first.  If we do TESTFN2 first, then it hogs
+        # gigabytes of disk space for the duration of the test.
+        with TemporaryFile() as f:
+            self.zipTest(f, zipfile.ZIP_DEFLATED)
+            self.assertFalse(f.closed)
+        self.zipTest(TESTFN2, zipfile.ZIP_DEFLATED)
 
     def tearDown(self):
         for fname in TESTFN, TESTFN2: