From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 13 May 2016 18:19:44 +0000 (+0300)
Subject: Restored test_interleaved. After issue #8886 it was a duplicate of
X-Git-Tag: v2.7.12rc1~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e1c5f7dae23ce0a3a8604a950349c2f0767de32;p=thirdparty%2FPython%2Fcpython.git

Restored test_interleaved. After issue #8886 it was a duplicate of
test_different_file.
---

diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
index 01750c1b125b..40033f22f4fc 100644
--- a/Lib/test/test_zipfile.py
+++ b/Lib/test/test_zipfile.py
@@ -1456,11 +1456,12 @@ class TestsWithMultipleOpens(unittest.TestCase):
         # multiple open() calls can be made without interfering with each other.
         self.make_test_archive(TESTFN2)
         with zipfile.ZipFile(TESTFN2, mode="r") as zipf:
-            with zipf.open('ones') as zopen1, zipf.open('twos') as zopen2:
+            with zipf.open('ones') as zopen1:
                 data1 = zopen1.read(500)
-                data2 = zopen2.read(500)
-                data1 += zopen1.read()
-                data2 += zopen2.read()
+                with zipf.open('twos') as zopen2:
+                    data2 = zopen2.read(500)
+                    data1 += zopen1.read()
+                    data2 += zopen2.read()
             self.assertEqual(data1, self.data1)
             self.assertEqual(data2, self.data2)