Resolved merge conflicts

This commit is contained in:
Chantal D Gama Rose 2025-03-14 14:09:44 -07:00
commit 3b3195d8e6
69 changed files with 7693 additions and 467 deletions

View file

@ -102,3 +102,4 @@ def pytest_generate_tests(metafunc):
get_provider_fixture_overrides(metafunc.config, available_fixtures) or DEFAULT_PROVIDER_COMBINATIONS
)
metafunc.parametrize("safety_stack", combinations, indirect=True)