From 8a237272a236365fba9ecba668c440a95ea76879 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Sat, 9 Dec 2023 12:39:34 -0800 Subject: [PATCH] so much better --- conftest.py | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/conftest.py b/conftest.py index a8aed091e1..f940cf6b58 100644 --- a/conftest.py +++ b/conftest.py @@ -5,24 +5,6 @@ import random from openpilot.common.prefix import OpenpilotPrefix from openpilot.system.hardware import TICI -global_seed = None - - -# @pytest.fixture(scope="session", autouse=True) -def pytest_sessionstart(session): - # session.config.cache.clear_cache() - seed = random.randint(0, 100000) - print('setting seed in sessionstart', seed) - session.config.cache.set('worker/seed', seed) - - -# global global_seed -# global_seed = 0#random.randint(0, 10000) -# os.environ['PYTEST_SEED'] = '0' -# # random.seed(seed) -# # print(f"Random seed set to {seed} for worker") -# print(f"Random seed selected for this session: {global_seed}") - @pytest.fixture(scope="function", autouse=True) def openpilot_function_fixture(): @@ -70,12 +52,11 @@ def pytest_collection_modifyitems(config, items): @pytest.hookimpl(trylast=True) def pytest_configure(config): - if config.cache.get('worker/seed', None) is None: - config.cache.set('worker/seed', random.randint(0, 100000)) - seed = config.cache.get('worker/seed', None) - random.seed(seed) - print('setting seed in configure', seed) - config_line = ( - "xdist_group_class_property: group tests by a property of the class that contains them" - ) - config.addinivalue_line("markers", config_line) \ No newline at end of file + config_line = ( + "xdist_group_class_property: group tests by a property of the class that contains them" + ) + config.addinivalue_line("markers", config_line) + + # TODO: fix tests and enable test order randomization + if config.pluginmanager.hasplugin('randomly'): + config.addinivalue_line("addopts", "--randomly-dont-reorganize")