(original) (raw)

changeset: 101320:ba823131b25e branch: 2.7 parent: 101314:5f46ecaf8c6e user: Serhiy Storchaka storchaka@gmail.com date: Fri May 13 21:19:44 2016 +0300 files: Lib/test/test_zipfile.py description: Restored test_interleaved. After issue #8886 it was a duplicate of test_different_file. diff -r 5f46ecaf8c6e -r ba823131b25e Lib/test/test_zipfile.py --- a/Lib/test/test_zipfile.py Fri May 13 01:54:44 2016 +0000 +++ b/Lib/test/test_zipfile.py Fri May 13 21:19:44 2016 +0300 @@ -1456,11 +1456,12 @@ # 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) /storchaka@gmail.com