From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 11 Sep 2020 15:44:20 +0000 (-0400)
Subject: Attempt to strengthen gc test
X-Git-Tag: rel_1_4_0b1~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73cdd6c21fb5a9699ab8987f59c21ddef3d0b896;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Attempt to strengthen gc test

- ensure class registry is empty first
- gc_collect() twice

Change-Id: I61324931bfc1aafce97880320951e568be88f121
---

diff --git a/test/orm/declarative/test_mixin.py b/test/orm/declarative/test_mixin.py
index eed9185728..6189014aa9 100644
--- a/test/orm/declarative/test_mixin.py
+++ b/test/orm/declarative/test_mixin.py
@@ -1666,6 +1666,7 @@ class DeclaredAttrTest(DeclarativeTestBase, testing.AssertsCompiledSQL):
     @testing.requires.predictable_gc
     def test_singleton_gc(self):
         counter = mock.Mock()
+        Base.registry._class_registry.clear()
 
         class Mixin(object):
             @declared_attr
@@ -1684,6 +1685,7 @@ class DeclaredAttrTest(DeclarativeTestBase, testing.AssertsCompiledSQL):
         eq_(counter.mock_calls, [mock.call("A")])
         del A
         gc_collect()
+        gc_collect()
 
         from sqlalchemy.orm.clsregistry import _key_is_empty