diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2016-05-13 18:19:22 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-05-13 18:19:22 (GMT) |
commit | 91762da45bab10df71b01bab2587fcbaed58b53c (patch) | |
tree | 00def86d476f5ed8579f34e4f559237995bbafed /Lib | |
parent | 18ee29d0b870caddc0806916ca2c823254f1a1f9 (diff) | |
parent | d76c7c2bed3a6a3e840323647488ebf984914e4f (diff) | |
download | cpython-91762da45bab10df71b01bab2587fcbaed58b53c.zip cpython-91762da45bab10df71b01bab2587fcbaed58b53c.tar.gz cpython-91762da45bab10df71b01bab2587fcbaed58b53c.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.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py index b339955..6a77d6c 100644 --- a/Lib/test/test_zipfile.py +++ b/Lib/test/test_zipfile.py @@ -1867,11 +1867,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) |