saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Remove onedir pytest fixture workaround

Browse source
This commit is contained in:
Megan Wilhite 2023-08-02 11:45:02 -06:00 • committed by Pedro Algarvio
parent bf6ab537f7
commit 3a42b0ce58
2 changed files with 0 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
tests/pytests/functional/modules/conftest.py
View file

@ -1,27 +1,6 @@
import os
import pytest
@pytest.fixture(scope="package", autouse=True)
def _onedir_env():
"""
Functional tests cannot currently test the
onedir artifact. This will need to be removed
when we do add onedir support for functional tests.
This is specifically needed for testing the new
package grain when calling from the grains module.
"""
if os.environ.get("ONEDIR_TESTRUN", "0") == "1":
try:
os.environ["ONEDIR_TESTRUN"] = "0"
yield
finally:
os.environ["ONEDIR_TESTRUN"] = "1"
else:
yield
@pytest.fixture(scope="module")
def modules(loaders):
return loaders.modules

19
tests/pytests/unit/conftest.py
View file

@ -1,27 +1,8 @@
import os
import pytest
import salt.config
@pytest.fixture(scope="package", autouse=True)
def _onedir_env():
"""
Unit tests cannot currently test the
onedir artifact. This will need to be removed
when we do add onedir support for functional tests.
"""
if os.environ.get("ONEDIR_TESTRUN", "0") == "1":
try:
os.environ["ONEDIR_TESTRUN"] = "0"
yield
finally:
os.environ["ONEDIR_TESTRUN"] = "1"
else:
yield
@pytest.fixture
def minion_opts(tmp_path):
"""