mirror of
https://github.com/python/cpython.git
synced 2025-10-05 14:41:07 +00:00
bpo-29110: Fix file object leak in aifc.open
(GH-311)
(cherry picked from commit03f68b6
) (GH-162) (cherry picked from commit5dc33ee
) (GH-293)
This commit is contained in:
parent
21c697fd10
commit
b7fb1e25c8
3 changed files with 45 additions and 13 deletions
|
@ -1,5 +1,6 @@
|
|||
from test.support import findfile, TESTFN, unlink
|
||||
from test.support import check_no_resource_warning, findfile, TESTFN, unlink
|
||||
import unittest
|
||||
from unittest import mock
|
||||
from test import audiotests
|
||||
from audioop import byteswap
|
||||
import os
|
||||
|
@ -150,6 +151,21 @@ class AifcMiscTest(audiotests.AudioTests, unittest.TestCase):
|
|||
#This file contains chunk types aifc doesn't recognize.
|
||||
self.f = aifc.open(findfile('Sine-1000Hz-300ms.aif'))
|
||||
|
||||
def test_close_opened_files_on_error(self):
|
||||
non_aifc_file = findfile('pluck-pcm8.wav', subdir='audiodata')
|
||||
with check_no_resource_warning(self):
|
||||
with self.assertRaises(aifc.Error):
|
||||
# Try opening a non-AIFC file, with the expectation that
|
||||
# `aifc.open` will fail (without raising a ResourceWarning)
|
||||
self.f = aifc.open(non_aifc_file, 'rb')
|
||||
|
||||
# Aifc_write.initfp() won't raise in normal case. But some errors
|
||||
# (e.g. MemoryError, KeyboardInterrupt, etc..) can happen.
|
||||
with mock.patch.object(aifc.Aifc_write, 'initfp',
|
||||
side_effect=RuntimeError):
|
||||
with self.assertRaises(RuntimeError):
|
||||
self.fout = aifc.open(TESTFN, 'wb')
|
||||
|
||||
def test_params_added(self):
|
||||
f = self.f = aifc.open(TESTFN, 'wb')
|
||||
f.aiff()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue