From 866469b80cf5f5282a09259387ab82df6c02aa01 Mon Sep 17 00:00:00 2001
From: Stefan Behnel <stefan_ml@behnel.de>
Date: Thu, 30 May 2024 18:11:24 +0200
Subject: [PATCH] Simplify test, move it to a better place and remove debug
 code.

---
 lupa/_lupa.pyx     |  1 -
 lupa/tests/test.py | 47 ++++++++++++++++++----------------------------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/lupa/_lupa.pyx b/lupa/_lupa.pyx
index 15df87c8..2b07da44 100644
--- a/lupa/_lupa.pyx
+++ b/lupa/_lupa.pyx
@@ -345,7 +345,6 @@ cdef class LuaRuntime:
         L = self._state
         for ref in pending_unrefs:
             lua.luaL_unref(L, lua.LUA_REGISTRYINDEX, ref)
-        print(f"Cleaned up {len(pending_unrefs)} Lua refs")  # TODO: remove
         return 0
 
     def __dealloc__(self):
diff --git a/lupa/tests/test.py b/lupa/tests/test.py
index ca4ecb2d..dc8b0a2b 100644
--- a/lupa/tests/test.py
+++ b/lupa/tests/test.py
@@ -55,6 +55,7 @@ def _run_gc_test(self, run_test, off_by_one=False):
             run_test()
         del i
         gc.collect()
+
         new_count = len(gc.get_objects())
         if off_by_one and old_count == new_count + 1:
             # FIXME: This happens in test_attrgetter_refcycle - need to investigate why!
@@ -102,35 +103,6 @@ def get_attr(obj, name):
         # Seems related to running the test twice in the same Lupa module?
         self._run_gc_test(make_refcycle, off_by_one=True)
 
-    def test_lupa_gc_deadlock(self):
-        def assert_no_deadlock(thread):
-            thread.start()
-            thread.join(1)
-            assert not thread.is_alive(), "thread didn't finish - deadlock?"
-
-        def delete_table_reference_in_thread():
-            ref = [lua.eval("{}")]
-
-            def trigger_gc(ref):
-                del ref[0]
-
-            lua.execute(
-                "f,x=...; f(x)",
-                assert_no_deadlock,
-                threading.Thread(target=trigger_gc, args=[ref]),
-            )
-            lua.gccollect()
-
-        # Pre-initialise threading outside of the refcount checks.
-        lua = self.lupa.LuaRuntime()
-        assert_no_deadlock(threading.Thread())
-        delete_table_reference_in_thread()
-        gc.collect()
-
-        # Run test.
-        lua = self.lupa.LuaRuntime()
-        self._run_gc_test(delete_table_reference_in_thread)
-
 
 class TestLuaRuntime(SetupLuaRuntimeMixin, LupaTestCase):
     def assertLuaResult(self, lua_expression, result):
@@ -2133,6 +2105,23 @@ def mandelbrot(i, lua_func):
         ##     image = Image.fromstring('1', (image_size, image_size), result_bytes)
         ##     image.show()
 
+    def test_lua_gc_deadlock(self):
+        # Delete a Lua reference from a thread while the LuaRuntime is running.
+        lua = self.lupa.LuaRuntime()
+        ref = [lua.eval("{}")]
+
+        def trigger_gc(ref):
+            del ref[0]
+
+        thread = threading.Thread(target=trigger_gc, args=[ref])
+
+        lua.execute(
+            "start, join = ...; start(); join()",
+            thread.start,
+            thread.join,
+        )
+        assert not thread.is_alive(), "thread didn't finish - deadlock?"
+
 
 class TestDontUnpackTuples(LupaTestCase):
     def setUp(self):