From: Federico Caselli Date: Sat, 11 Jul 2020 17:10:26 +0000 (+0200) Subject: Make call-count profiling tests on osx have their own platform key X-Git-Tag: rel_1_4_0b1~224^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc638994aedf0ff7c0c4ab09bbb0a22196c9a716;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Make call-count profiling tests on osx have their own platform key They previously would use the linux profiles, but recently some discrepancies in the function call count on osx would make the tests fail. Change-Id: Ifdfdca1676972de4179f59cdaae196f6805d4a21 --- diff --git a/lib/sqlalchemy/testing/profiling.py b/lib/sqlalchemy/testing/profiling.py index c50ce1e153..c7ccf46880 100644 --- a/lib/sqlalchemy/testing/profiling.py +++ b/lib/sqlalchemy/testing/profiling.py @@ -23,6 +23,7 @@ import sys from . import config from .util import gc_collect from ..util import cpython +from ..util import osx from ..util import win32 @@ -106,6 +107,8 @@ class ProfileStatsFile(object): if win32: platform_tokens.append("win") + if osx: + platform_tokens.append("osx") platform_tokens.append( "nativeunicode" if config.db.dialect.convert_unicode diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py index b2407ea18d..cea9c4f667 100644 --- a/lib/sqlalchemy/util/__init__.py +++ b/lib/sqlalchemy/util/__init__.py @@ -60,6 +60,7 @@ from .compat import itertools_filter # noqa from .compat import itertools_filterfalse # noqa from .compat import namedtuple # noqa from .compat import next # noqa +from .compat import osx # noqa from .compat import parse_qsl # noqa from .compat import perf_counter # noqa from .compat import pickle # noqa diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py index 806ef8ae18..88e3c1640b 100644 --- a/lib/sqlalchemy/util/compat.py +++ b/lib/sqlalchemy/util/compat.py @@ -23,6 +23,7 @@ py2k = sys.version_info < (3, 0) cpython = platform.python_implementation() == "CPython" win32 = sys.platform.startswith("win") +osx = sys.platform.startswith("darwin") has_refcount_gc = bool(cpython)