diff -r c711c36cf988 Lib/test/support/__init__.py --- a/Lib/test/support/__init__.py Wed Feb 10 10:31:43 2016 +0200 +++ b/Lib/test/support/__init__.py Wed Feb 10 12:12:03 2016 +0200 @@ -102,7 +102,8 @@ except ImportError: # threads "threading_setup", "threading_cleanup", "reap_threads", "start_threads", # miscellaneous - "check_warnings", "EnvironmentVarGuard", "run_with_locale", "swap_item", + "check_warnings", "check_no_resource_warning", "EnvironmentVarGuard", + "run_with_locale", "swap_item", "swap_attr", "Matcher", "set_memlimit", "SuppressCrashReport", "sortdict", "run_with_tz", ] @@ -1149,6 +1150,16 @@ def check_warnings(*filters, **kwargs): return _filterwarnings(filters, quiet) +@contextlib.contextmanager +def check_no_resource_warning(self): + """Context manager to check that no ResourceWarning is emitted.""" + with warnings.catch_warnings(record=True) as warns: + warnings.filterwarnings('always', category=ResourceWarning) + yield + gc_collect() + self.assertEqual(warns, []) + + class CleanImport(object): """Context manager to force import to return a new module reference. diff -r c711c36cf988 Lib/test/test_asyncio/test_subprocess.py --- a/Lib/test/test_asyncio/test_subprocess.py Wed Feb 10 10:31:43 2016 +0200 +++ b/Lib/test/test_asyncio/test_subprocess.py Wed Feb 10 12:12:03 2016 +0200 @@ -427,10 +427,9 @@ class SubprocessMixin: create = asyncio.create_subprocess_exec(sys.executable, '-c', 'pass', loop=self.loop) - with warnings.catch_warnings(record=True) as warns: + with support.check_no_resource_warning(self): with self.assertRaises(exc): self.loop.run_until_complete(create) - self.assertEqual(warns, []) if sys.platform != 'win32': diff -r c711c36cf988 Lib/test/test_io.py --- a/Lib/test/test_io.py Wed Feb 10 10:31:43 2016 +0200 +++ b/Lib/test/test_io.py Wed Feb 10 12:12:03 2016 +0200 @@ -681,18 +681,14 @@ class IOTest(unittest.TestCase): f2.readline() def test_nonbuffered_textio(self): - with warnings.catch_warnings(record=True) as recorded: + with support.check_no_resource_warning(self): with self.assertRaises(ValueError): self.open(support.TESTFN, 'w', buffering=0) - support.gc_collect() - self.assertEqual(recorded, []) def test_invalid_newline(self): - with warnings.catch_warnings(record=True) as recorded: + with support.check_no_resource_warning(self): with self.assertRaises(ValueError): self.open(support.TESTFN, 'w', newline='invalid') - support.gc_collect() - self.assertEqual(recorded, []) class CIOTest(IOTest): @@ -3366,10 +3362,8 @@ class MiscIOTest(unittest.TestCase): # When using closefd=False, there's no warning r, w = os.pipe() fds += r, w - with warnings.catch_warnings(record=True) as recorded: + with support.check_no_resource_warning(self): open(r, *args, closefd=False, **kwargs) - support.gc_collect() - self.assertEqual(recorded, []) def test_warn_on_dealloc_fd(self): self._check_warn_on_dealloc_fd("rb", buffering=0) diff -r c711c36cf988 Lib/test/test_xml_etree.py --- a/Lib/test/test_xml_etree.py Wed Feb 10 10:31:43 2016 +0200 +++ b/Lib/test/test_xml_etree.py Wed Feb 10 12:12:03 2016 +0200 @@ -569,14 +569,11 @@ class ElementTreeTest(unittest.TestCase) self.assertFalse(f.closed) self.assertEqual(str(cm.exception), "unknown event 'bogus'") - with warnings.catch_warnings(record=True) as w: - warnings.filterwarnings("always", category=ResourceWarning) + with support.check_no_resource_warning(self): with self.assertRaises(ValueError) as cm: iterparse(SIMPLE_XMLFILE, events) self.assertEqual(str(cm.exception), "unknown event 'bogus'") del cm - support.gc_collect() - self.assertEqual(w, []) source = io.BytesIO( b"\n" @@ -603,15 +600,12 @@ class ElementTreeTest(unittest.TestCase) it = iterparse(TESTFN) action, elem = next(it) self.assertEqual((action, elem.tag), ('end', 'document')) - with warnings.catch_warnings(record=True) as w: - warnings.filterwarnings("always", category=ResourceWarning) + with support.check_no_resource_warning(self): with self.assertRaises(ET.ParseError) as cm: next(it) self.assertEqual(str(cm.exception), 'junk after document element: line 1, column 12') del cm, it - support.gc_collect() - self.assertEqual(w, []) def test_writefile(self): elem = ET.Element("tag")