From: Federico Caselli Date: Sat, 12 Nov 2022 19:15:26 +0000 (+0100) Subject: Repair test in 32bit python builds. X-Git-Tag: rel_2_0_0b4~58 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f4ac8d155f58b59cf314cfbc73195ed51a0c146;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Repair test in 32bit python builds. Change-Id: I8287f3e1a975534c8a01a41c9dcc7e5e9f08bb52 --- diff --git a/lib/sqlalchemy/testing/requirements.py b/lib/sqlalchemy/testing/requirements.py index 38d962fef7..3c63e93624 100644 --- a/lib/sqlalchemy/testing/requirements.py +++ b/lib/sqlalchemy/testing/requirements.py @@ -1438,6 +1438,10 @@ class SuiteRequirements(Requirements): lambda: util.cpython, "cPython interpreter needed" ) + @property + def is64bit(self): + return exclusions.only_if(lambda: util.is64bit, "64bit required") + @property def patch_library(self): def check_lib(): diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py index bb4642a4ff..e82cfd7694 100644 --- a/lib/sqlalchemy/util/__init__.py +++ b/lib/sqlalchemy/util/__init__.py @@ -58,6 +58,7 @@ from .compat import decode_backslashreplace as decode_backslashreplace from .compat import dottedgetter as dottedgetter from .compat import has_refcount_gc as has_refcount_gc from .compat import inspect_getfullargspec as inspect_getfullargspec +from .compat import is64bit as is64bit from .compat import local_dataclass_fields as local_dataclass_fields from .compat import osx as osx from .compat import py310 as py310 diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py index 2899b42586..24f9bcf106 100644 --- a/lib/sqlalchemy/util/compat.py +++ b/lib/sqlalchemy/util/compat.py @@ -41,6 +41,7 @@ cpython = platform.python_implementation() == "CPython" win32 = sys.platform.startswith("win") osx = sys.platform.startswith("darwin") arm = "aarch" in platform.machine().lower() +is64bit = platform.architecture()[0] == "64bit" has_refcount_gc = bool(cpython) diff --git a/test/orm/test_cache_key.py b/test/orm/test_cache_key.py index 3106a71ad7..a0bf8b5981 100644 --- a/test/orm/test_cache_key.py +++ b/test/orm/test_cache_key.py @@ -1092,7 +1092,11 @@ class EmbeddedSubqTest(_RemoveListeners, DeclarativeMappedTest): "concrete": True, } - @testing.combinations("tuples", "memory", argnames="assert_on") + Base.registry.configure() + + @testing.combinations( + "tuples", ("memory", testing.requires.is64bit), argnames="assert_on" + ) def test_cache_key_gen(self, assert_on): Employee = self.classes.Employee