From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 13 May 2016 18:18:58 +0000 (+0300)
Subject: Restored test_interleaved. After issue #8886 it was a duplicate of
X-Git-Tag: v3.6.0a1~32^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d76c7c2bed3a6a3e840323647488ebf984914e4f;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 2c10821a0cda..d278e06a453b 100644
--- a/Lib/test/test_zipfile.py
+++ b/Lib/test/test_zipfile.py
@@ -1809,11 +1809,12 @@ class TestsWithMultipleOpens(unittest.TestCase):
         for f in get_files(self):
             self.make_test_archive(f)
             with zipfile.ZipFile(f, 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)