From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 11 Sep 2020 22:15:51 +0000 (-0400)
Subject: Tear down InstrumentationEvents for declarative test
X-Git-Tag: rel_1_4_0b1~108
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2eba7d74403316b4df4d2cc12f1aea36d209c2f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Tear down InstrumentationEvents for declarative test

Fixes gc collection issues later on that occur in test_mixin.py

HUGE thanks to Federico Caselli for finding the issue!

Change-Id: I6444e868ab3d6ff62fb644ebe2fbded7df139c9c
---

diff --git a/test/orm/declarative/test_basic.py b/test/orm/declarative/test_basic.py
index 9a7c6ef91e..4cfbf63158 100644
--- a/test/orm/declarative/test_basic.py
+++ b/test/orm/declarative/test_basic.py
@@ -35,6 +35,7 @@ from sqlalchemy.orm import Session
 from sqlalchemy.orm import synonym_for
 from sqlalchemy.orm.decl_api import DeclarativeMeta
 from sqlalchemy.orm.decl_base import _DeferredMapperConfig
+from sqlalchemy.orm.events import InstrumentationEvents
 from sqlalchemy.orm.events import MapperEvents
 from sqlalchemy.testing import assert_raises
 from sqlalchemy.testing import assert_raises_message
@@ -2091,6 +2092,7 @@ class DeclarativeTest(DeclarativeTestBase):
         )
 
     @testing.teardown_events(MapperEvents)
+    @testing.teardown_events(InstrumentationEvents)
     def test_instrument_class_before_instrumentation(self):
         # test #3388