From c0692f64a7e4aa805b0df11a5bd82ccc33e125dd Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 13 May 2022 10:53:07 -0400 Subject: [PATCH] Revert "search for pickle failures" This reverts commit 48ccecbe69795753baac1ca6d351c1af5ebcdd7b. not being careful w/ the commandline as I eat breakfast today --- lib/sqlalchemy/testing/pickleable.py | 8 -------- test/orm/_fixtures.py | 17 ----------------- test/orm/test_selectin_relations.py | 19 ++----------------- 3 files changed, 2 insertions(+), 42 deletions(-) diff --git a/lib/sqlalchemy/testing/pickleable.py b/lib/sqlalchemy/testing/pickleable.py index fb02157780..04405e5397 100644 --- a/lib/sqlalchemy/testing/pickleable.py +++ b/lib/sqlalchemy/testing/pickleable.py @@ -20,14 +20,6 @@ class Order(fixtures.ComparableEntity): pass -class Item(fixtures.ComparableEntity): - pass - - -class Keyword(fixtures.ComparableEntity): - pass - - class Dingaling(fixtures.ComparableEntity): pass diff --git a/test/orm/_fixtures.py b/test/orm/_fixtures.py index 64a86ce7e5..6715cb7fea 100644 --- a/test/orm/_fixtures.py +++ b/test/orm/_fixtures.py @@ -396,23 +396,6 @@ class FixtureTest(fixtures.MappedTest): return CannedResults(self) -class PickleFixtureMixin(object): - @classmethod - def setup_classes(cls): - from sqlalchemy.testing import pickleable - - cls.classes.update( - { - "User": pickleable.User, - "Order": pickleable.Order, - "Address": pickleable.Address, - "Item": pickleable.Item, - "Keyword": pickleable.Keyword, - "Dingaling": pickleable.Dingaling, - } - ) - - class CannedResults(object): """Built on demand, instances use mappers in effect at time of call.""" diff --git a/test/orm/test_selectin_relations.py b/test/orm/test_selectin_relations.py index 5df1c00e64..3e44abe88f 100644 --- a/test/orm/test_selectin_relations.py +++ b/test/orm/test_selectin_relations.py @@ -1,5 +1,3 @@ -import pickle - import sqlalchemy as sa from sqlalchemy import bindparam from sqlalchemy import ForeignKey @@ -45,11 +43,7 @@ from .inheritance._poly_fixtures import Paperwork from .inheritance._poly_fixtures import Person -class EagerTest( - _fixtures.PickleFixtureMixin, - _fixtures.FixtureTest, - testing.AssertsCompiledSQL, -): +class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL): run_inserts = "once" run_deletes = None @@ -765,17 +759,8 @@ class EagerTest( with fixture_session() as sess: def go(): - result = ( - sess.query(User).options(*opts).order_by(User.id).all() - ) - eq_( - result, - self.static.user_item_keyword_result, - ) - - print(f"pickling User structure based on: {opts}") eq_( - pickle.loads(pickle.dumps(result)), + sess.query(User).options(*opts).order_by(User.id).all(), self.static.user_item_keyword_result, ) -- 2.47.2