summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2016-05-13 18:18:58 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2016-05-13 18:18:58 (GMT)
commitd76c7c2bed3a6a3e840323647488ebf984914e4f (patch)
tree81c76b6ba82b796cb975074c46082454f1c53291 /Lib
parent9642eedc0a6d90d9502658a6569518741eea9ef3 (diff)
downloadcpython-d76c7c2bed3a6a3e840323647488ebf984914e4f.zip
cpython-d76c7c2bed3a6a3e840323647488ebf984914e4f.tar.gz
cpython-d76c7c2bed3a6a3e840323647488ebf984914e4f.tar.bz2
Restored test_interleaved. After issue #8886 it was a duplicate of
test_different_file.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_zipfile.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
index 2c10821..d278e06 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)