From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 11 Sep 2020 22:09:31 +0000 (-0400)
Subject: Revert "remote debugging"
X-Git-Tag: rel_1_4_0b1~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01c34a7389d8c71b1f24107e66eba129feb1d65e;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Revert "remote debugging"

This reverts commit ce0b2f3cd1869331b6bcc971219789f3578ff705.

Revert "remote debugging continued"

This reverts commit 881d6f12f70e1b594695e2bbc7b87ab846407f58.

Revert "try to debug failing test on github workers"

This reverts commit 26d2c43c141ba6240fd2d2e01c280ecbe64c3faf.

Revert "Attempt to strengthen gc test"

This reverts commit 73cdd6c21fb5a9699ab8987f59c21ddef3d0b896.
---

diff --git a/test/orm/declarative/test_mixin.py b/test/orm/declarative/test_mixin.py
index 0b1416035e..eed9185728 100644
--- a/test/orm/declarative/test_mixin.py
+++ b/test/orm/declarative/test_mixin.py
@@ -31,6 +31,7 @@ from sqlalchemy.testing import is_
 from sqlalchemy.testing import mock
 from sqlalchemy.testing.schema import Column
 from sqlalchemy.testing.schema import Table
+from sqlalchemy.testing.util import gc_collect
 from sqlalchemy.util import classproperty
 
 Base = None
@@ -1666,8 +1667,6 @@ class DeclaredAttrTest(DeclarativeTestBase, testing.AssertsCompiledSQL):
     def test_singleton_gc(self):
         counter = mock.Mock()
 
-        Base.registry._class_registry.clear()
-
         class Mixin(object):
             @declared_attr
             def my_prop(cls):
@@ -1683,29 +1682,16 @@ class DeclaredAttrTest(DeclarativeTestBase, testing.AssertsCompiledSQL):
                 return column_property(cls.my_prop + 5)
 
         eq_(counter.mock_calls, [mock.call("A")])
-        import gc
-
         del A
-
-        status = ""
-        for i in range(8):
-            status += " %s" % (gc.collect(),)
+        gc_collect()
 
         from sqlalchemy.orm.clsregistry import _key_is_empty
 
-        if not _key_is_empty(
+        assert _key_is_empty(
             "A",
             Base.registry._class_registry,
             lambda cls: hasattr(cls, "my_other_prop"),
-        ):
-            actual_a = Base.registry._class_registry["A"]
-            refs = gc.get_referents(actual_a)
-            assert False, "registry keys: %s, obj: %s %s referents: %s" % (
-                list(Base.registry._class_registry.keys()),
-                Base.registry._class_registry["A"],
-                status,
-                refs,
-            )
+        )
 
     def test_can_we_access_the_mixin_straight(self):
         class Mixin(object):