summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorFederico Caselli <cfederico87@gmail.com>2020-07-11 19:10:26 +0200
committerFederico Caselli <cfederico87@gmail.com>2020-07-11 19:10:26 +0200
commitcc638994aedf0ff7c0c4ab09bbb0a22196c9a716 (patch)
treebb0561576d2bc4f11e2bcb1f645eb9db6055522a /lib/sqlalchemy
parent9f6493a8951e58e36b37e31a2787c426ffe04451 (diff)
downloadsqlalchemy-cc638994aedf0ff7c0c4ab09bbb0a22196c9a716.tar.gz
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
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/testing/profiling.py3
-rw-r--r--lib/sqlalchemy/util/__init__.py1
-rw-r--r--lib/sqlalchemy/util/compat.py1
3 files changed, 5 insertions, 0 deletions
diff --git a/lib/sqlalchemy/testing/profiling.py b/lib/sqlalchemy/testing/profiling.py
index c50ce1e15..c7ccf4688 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 b2407ea18..cea9c4f66 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 806ef8ae1..88e3c1640 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)