diff --git a/Lib/test/test_contextlib.py b/Lib/test/test_contextlib.py index 04720d949fe..43b8507771e 100644 --- a/Lib/test/test_contextlib.py +++ b/Lib/test/test_contextlib.py @@ -231,6 +231,8 @@ def woohoo(): def woohoo(a, b): a = weakref.ref(a) b = weakref.ref(b) + # Allow test to work with a non-refcounted GC + support.gc_collect() self.assertIsNone(a()) self.assertIsNone(b()) yield diff --git a/Lib/test/test_contextlib_async.py b/Lib/test/test_contextlib_async.py index 6a218f91156..74fddef3f34 100644 --- a/Lib/test/test_contextlib_async.py +++ b/Lib/test/test_contextlib_async.py @@ -1,7 +1,7 @@ import asyncio from contextlib import ( asynccontextmanager, AbstractAsyncContextManager, - AsyncExitStack, nullcontext, aclosing) + AsyncExitStack, nullcontext, aclosing, contextmanager) import functools from test import support import unittest @@ -357,14 +357,17 @@ class AclosingTestCase(unittest.TestCase): async def test_aclosing_bpo41229(self): state = [] - class Resource: - def __del__(self): + @contextmanager + def sync_resource(): + try: + yield + finally: state.append(1) async def agenfunc(): - r = Resource() - yield -1 - yield -2 + with sync_resource(): + yield -1 + yield -2 x = agenfunc() self.assertEqual(state, []) diff --git a/Misc/NEWS.d/next/Tests/2021-06-26-18-37-36.bpo-44515.e9fO6f.rst b/Misc/NEWS.d/next/Tests/2021-06-26-18-37-36.bpo-44515.e9fO6f.rst new file mode 100644 index 00000000000..d2867b6e89f --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2021-06-26-18-37-36.bpo-44515.e9fO6f.rst @@ -0,0 +1,2 @@ +Adjust recently added contextlib tests to avoid assuming the use of a +refcounted GC