mirror of
https://github.com/python/cpython.git
synced 2025-11-02 03:01:58 +00:00
bpo-22831: Use "with" to avoid possible fd leaks in tests (part 1). (GH-10928)
This commit is contained in:
Serhiy Storchaka
GitHub
parent
b727239575
commit
9e4861f523
5 changed files with 247 additions and 291 deletions
|
|
@ -31,42 +31,39 @@ class TestsWithSourceFile(unittest.TestCase):
|
|||
self.data = '\n'.join(line_gen).encode('ascii')
|
||||
|
||||
# And write it to a file.
|
||||
fp = open(TESTFN, "wb")
|
||||
fp.write(self.data)
|
||||
fp.close()
|
||||
with open(TESTFN, "wb") as fp:
|
||||
fp.write(self.data)
|
||||
|
||||
def zipTest(self, f, compression):
|
||||
# Create the ZIP archive.
|
||||
zipfp = zipfile.ZipFile(f, "w", compression)
|
||||
with zipfile.ZipFile(f, "w", compression) as zipfp:
|
||||
|
||||
# It will contain enough copies of self.data to reach about 6 GiB of
|
||||
# raw data to store.
|
||||
filecount = 6*1024**3 // len(self.data)
|
||||
# It will contain enough copies of self.data to reach about 6 GiB of
|
||||
# raw data to store.
|
||||
filecount = 6*1024**3 // len(self.data)
|
||||
|
||||
next_time = time.monotonic() + _PRINT_WORKING_MSG_INTERVAL
|
||||
for num in range(filecount):
|
||||
zipfp.writestr("testfn%d" % num, self.data)
|
||||
# Print still working message since this test can be really slow
|
||||
if next_time <= time.monotonic():
|
||||
next_time = time.monotonic() + _PRINT_WORKING_MSG_INTERVAL
|
||||
print((
|
||||
' zipTest still writing %d of %d, be patient...' %
|
||||
(num, filecount)), file=sys.__stdout__)
|
||||
sys.__stdout__.flush()
|
||||
zipfp.close()
|
||||
next_time = time.monotonic() + _PRINT_WORKING_MSG_INTERVAL
|
||||
for num in range(filecount):
|
||||
zipfp.writestr("testfn%d" % num, self.data)
|
||||
# Print still working message since this test can be really slow
|
||||
if next_time <= time.monotonic():
|
||||
next_time = time.monotonic() + _PRINT_WORKING_MSG_INTERVAL
|
||||
print((
|
||||
' zipTest still writing %d of %d, be patient...' %
|
||||
(num, filecount)), file=sys.__stdout__)
|
||||
sys.__stdout__.flush()
|
||||
|
||||
# Read the ZIP archive
|
||||
zipfp = zipfile.ZipFile(f, "r", compression)
|
||||
for num in range(filecount):
|
||||
self.assertEqual(zipfp.read("testfn%d" % num), self.data)
|
||||
# Print still working message since this test can be really slow
|
||||
if next_time <= time.monotonic():
|
||||
next_time = time.monotonic() + _PRINT_WORKING_MSG_INTERVAL
|
||||
print((
|
||||
' zipTest still reading %d of %d, be patient...' %
|
||||
(num, filecount)), file=sys.__stdout__)
|
||||
sys.__stdout__.flush()
|
||||
zipfp.close()
|
||||
with zipfile.ZipFile(f, "r", compression) as zipfp:
|
||||
for num in range(filecount):
|
||||
self.assertEqual(zipfp.read("testfn%d" % num), self.data)
|
||||
# Print still working message since this test can be really slow
|
||||
if next_time <= time.monotonic():
|
||||
next_time = time.monotonic() + _PRINT_WORKING_MSG_INTERVAL
|
||||
print((
|
||||
' zipTest still reading %d of %d, be patient...' %
|
||||
(num, filecount)), file=sys.__stdout__)
|
||||
sys.__stdout__.flush()
|
||||
|
||||
def testStored(self):
|
||||
# Try the temp file first. If we do TESTFN2 first, then it hogs
|
||||
|
|
@ -95,56 +92,50 @@ class OtherTests(unittest.TestCase):
|
|||
def testMoreThan64kFiles(self):
|
||||
# This test checks that more than 64k files can be added to an archive,
|
||||
# and that the resulting archive can be read properly by ZipFile
|
||||
zipf = zipfile.ZipFile(TESTFN, mode="w", allowZip64=True)
|
||||
zipf.debug = 100
|
||||
numfiles = (1 << 16) * 3//2
|
||||
for i in range(numfiles):
|
||||
zipf.writestr("foo%08d" % i, "%d" % (i**3 % 57))
|
||||
self.assertEqual(len(zipf.namelist()), numfiles)
|
||||
zipf.close()
|
||||
with zipfile.ZipFile(TESTFN, mode="w", allowZip64=True) as zipf:
|
||||
zipf.debug = 100
|
||||
numfiles = (1 << 16) * 3//2
|
||||
for i in range(numfiles):
|
||||
zipf.writestr("foo%08d" % i, "%d" % (i**3 % 57))
|
||||
self.assertEqual(len(zipf.namelist()), numfiles)
|
||||
|
||||
zipf2 = zipfile.ZipFile(TESTFN, mode="r")
|
||||
self.assertEqual(len(zipf2.namelist()), numfiles)
|
||||
for i in range(numfiles):
|
||||
content = zipf2.read("foo%08d" % i).decode('ascii')
|
||||
self.assertEqual(content, "%d" % (i**3 % 57))
|
||||
zipf2.close()
|
||||
with zipfile.ZipFile(TESTFN, mode="r") as zipf2:
|
||||
self.assertEqual(len(zipf2.namelist()), numfiles)
|
||||
for i in range(numfiles):
|
||||
content = zipf2.read("foo%08d" % i).decode('ascii')
|
||||
self.assertEqual(content, "%d" % (i**3 % 57))
|
||||
|
||||
def testMoreThan64kFilesAppend(self):
|
||||
zipf = zipfile.ZipFile(TESTFN, mode="w", allowZip64=False)
|
||||
zipf.debug = 100
|
||||
numfiles = (1 << 16) - 1
|
||||
for i in range(numfiles):
|
||||
zipf.writestr("foo%08d" % i, "%d" % (i**3 % 57))
|
||||
self.assertEqual(len(zipf.namelist()), numfiles)
|
||||
with self.assertRaises(zipfile.LargeZipFile):
|
||||
zipf.writestr("foo%08d" % numfiles, b'')
|
||||
self.assertEqual(len(zipf.namelist()), numfiles)
|
||||
zipf.close()
|
||||
with zipfile.ZipFile(TESTFN, mode="w", allowZip64=False) as zipf:
|
||||
zipf.debug = 100
|
||||
numfiles = (1 << 16) - 1
|
||||
for i in range(numfiles):
|
||||
zipf.writestr("foo%08d" % i, "%d" % (i**3 % 57))
|
||||
self.assertEqual(len(zipf.namelist()), numfiles)
|
||||
with self.assertRaises(zipfile.LargeZipFile):
|
||||
zipf.writestr("foo%08d" % numfiles, b'')
|
||||
self.assertEqual(len(zipf.namelist()), numfiles)
|
||||
|
||||
zipf = zipfile.ZipFile(TESTFN, mode="a", allowZip64=False)
|
||||
zipf.debug = 100
|
||||
self.assertEqual(len(zipf.namelist()), numfiles)
|
||||
with self.assertRaises(zipfile.LargeZipFile):
|
||||
zipf.writestr("foo%08d" % numfiles, b'')
|
||||
self.assertEqual(len(zipf.namelist()), numfiles)
|
||||
zipf.close()
|
||||
with zipfile.ZipFile(TESTFN, mode="a", allowZip64=False) as zipf:
|
||||
zipf.debug = 100
|
||||
self.assertEqual(len(zipf.namelist()), numfiles)
|
||||
with self.assertRaises(zipfile.LargeZipFile):
|
||||
zipf.writestr("foo%08d" % numfiles, b'')
|
||||
self.assertEqual(len(zipf.namelist()), numfiles)
|
||||
|
||||
zipf = zipfile.ZipFile(TESTFN, mode="a", allowZip64=True)
|
||||
zipf.debug = 100
|
||||
self.assertEqual(len(zipf.namelist()), numfiles)
|
||||
numfiles2 = (1 << 16) * 3//2
|
||||
for i in range(numfiles, numfiles2):
|
||||
zipf.writestr("foo%08d" % i, "%d" % (i**3 % 57))
|
||||
self.assertEqual(len(zipf.namelist()), numfiles2)
|
||||
zipf.close()
|
||||
with zipfile.ZipFile(TESTFN, mode="a", allowZip64=True) as zipf:
|
||||
zipf.debug = 100
|
||||
self.assertEqual(len(zipf.namelist()), numfiles)
|
||||
numfiles2 = (1 << 16) * 3//2
|
||||
for i in range(numfiles, numfiles2):
|
||||
zipf.writestr("foo%08d" % i, "%d" % (i**3 % 57))
|
||||
self.assertEqual(len(zipf.namelist()), numfiles2)
|
||||
|
||||
zipf2 = zipfile.ZipFile(TESTFN, mode="r")
|
||||
self.assertEqual(len(zipf2.namelist()), numfiles2)
|
||||
for i in range(numfiles2):
|
||||
content = zipf2.read("foo%08d" % i).decode('ascii')
|
||||
self.assertEqual(content, "%d" % (i**3 % 57))
|
||||
zipf2.close()
|
||||
with zipfile.ZipFile(TESTFN, mode="r") as zipf2:
|
||||
self.assertEqual(len(zipf2.namelist()), numfiles2)
|
||||
for i in range(numfiles2):
|
||||
content = zipf2.read("foo%08d" % i).decode('ascii')
|
||||
self.assertEqual(content, "%d" % (i**3 % 57))
|
||||
|
||||
def tearDown(self):
|
||||
support.unlink(TESTFN)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue