From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 26 Jul 2021 21:21:36 +0000 (-0700)
Subject: bpo-44515: handle non-refcounted GC in contextlib tests (GH-26910) (GH-27379)
X-Git-Tag: v3.10.0rc1~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ea5e0d792a85b435ef299319dcd52e59f535cb1;p=thirdparty%2FPython%2Fcpython.git

bpo-44515: handle non-refcounted GC in contextlib tests (GH-26910) (GH-27379)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit a2c45e5bcf9d3dfff9f2699dbc161489897616b5)

Co-authored-by: Nick Coghlan <ncoghlan@gmail.com>
---

diff --git a/Lib/test/test_contextlib.py b/Lib/test/test_contextlib.py
index e6500da0ba54..5a080654acb6 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 9cb40d1d6066..603162eaeaa7 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 000000000000..d2867b6e89f8
--- /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