From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 26 Mar 2021 19:40:34 +0000 (-0400)
Subject: run new relationship criteria tests on empty session
X-Git-Tag: rel_1_4_4~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e54c68fe5edec6f6c92153280799f2ad69aaff9;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

run new relationship criteria tests on empty session

The commit in 56f9c7743e9083add69a10501a503f4 forgot to make
sure the full reload took place, either via populate_existing()
or session.close(), with failure only showing up in pypy.

Fixes: #6139
Change-Id: Id3d3a18a8d6225ef862055abf2b66ffde72107fb
---

diff --git a/test/orm/test_relationship_criteria.py b/test/orm/test_relationship_criteria.py
index 89f598ae39..d93c63fb7e 100644
--- a/test/orm/test_relationship_criteria.py
+++ b/test/orm/test_relationship_criteria.py
@@ -1001,6 +1001,7 @@ class RelationshipCriteriaTest(_Fixtures, testing.AssertsCompiledSQL):
             return result
 
         for value in "ed@wood.com", "ed@lala.com":
+            s.close()
             with self.sql_execution_asserter() as asserter:
 
                 result = go(value)
@@ -1043,6 +1044,7 @@ class RelationshipCriteriaTest(_Fixtures, testing.AssertsCompiledSQL):
             return result
 
         for value in "ed@wood.com", "ed@lala.com":
+            s.close()
             with self.sql_execution_asserter() as asserter:
                 result = go(value)
 
@@ -1079,7 +1081,7 @@ class RelationshipCriteriaTest(_Fixtures, testing.AssertsCompiledSQL):
         s = Session(testing.db, future=True)
 
         def go(value):
-
+            s.close()
             stmt = (
                 select(User)
                 .options(
@@ -1152,6 +1154,7 @@ class RelationshipCriteriaTest(_Fixtures, testing.AssertsCompiledSQL):
         s = Session(testing.db, future=True)
 
         def go(value):
+            s.close()
             stmt = (
                 select(User)
                 .options(