From 231458a80fca410a1740574c9cfbd9a8b069a937 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Mon, 28 Jun 2021 10:35:18 -0500 Subject: [PATCH] sort actx for pytest --- arraycontext/pytest.py | 3 +++ test/test_arraycontext.py | 2 +- test/test_utils.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arraycontext/pytest.py b/arraycontext/pytest.py index 6f63a6c..e9614e1 100644 --- a/arraycontext/pytest.py +++ b/arraycontext/pytest.py @@ -251,6 +251,9 @@ def pytest_generate_tests_for_array_contexts( # }}} + # Sort the actx's so that parallel pytest works + arg_value_tuples = sorted(arg_value_tuples, key=lambda x: x.__str__()) + metafunc.parametrize(arg_names, arg_value_tuples, ids=ids) return inner diff --git a/test/test_arraycontext.py b/test/test_arraycontext.py index e9d9d5e..1bfaef4 100644 --- a/test/test_arraycontext.py +++ b/test/test_arraycontext.py @@ -36,7 +36,7 @@ from arraycontext import ( ArrayContainer,) from arraycontext import ( # noqa: F401 pytest_generate_tests_for_array_contexts, - _acf) + ) from arraycontext.pytest import (_PytestPyOpenCLArrayContextFactoryWithClass, _PytestPytatoPyOpenCLArrayContextFactory) diff --git a/test/test_utils.py b/test/test_utils.py index e40dda1..90b3752 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -25,7 +25,7 @@ THE SOFTWARE. from arraycontext import ( # noqa: F401 pytest_generate_tests_for_array_contexts, - _acf) + ) import logging logger = logging.getLogger(__name__) -- GitLab