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 2

The minimum PyTest version is now >= 7.0

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2022-12-05 09:18:24 +00:00 • committed by Pedro Algarvio
parent 8a769342d6
commit c668dcaf5c
2 changed files with 4 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tests/pytests/functional/states/pkgrepo/test_centos.py
View file

@ -1,11 +1,7 @@
import logging
import _pytest._version
import pytest
PYTEST_GE_7 = getattr(_pytest._version, "version_tuple", (-1, -1)) >= (7, 0)
log = logging.getLogger(__name__)
pytestmark = [
@ -80,14 +76,11 @@ RjsC7FDbL017qxS+ZVA/HGkyfiu4cpgV8VUnbql5eAZ+1Ll6Dw==
@pytest.fixture
def pkgrepo(states, grains):
if grains["os_family"] != "RedHat":
exc_kwargs = {}
if PYTEST_GE_7:
exc_kwargs["_use_item_location"] = True
raise pytest.skip.Exception(
"Test only for CentOS platforms, not '{}' based distributions.".format(
grains["os_family"]
),
**exc_kwargs
_use_item_location=True,
)
return states.pkgrepo

14
tests/support/pytest/helpers.py
View file

@ -16,7 +16,6 @@ import types
import warnings
from contextlib import contextmanager
import _pytest._version
import attr
import pytest
from saltfactories.utils import random_string
@ -28,9 +27,6 @@ from tests.support.pytest.loader import LoaderModuleMock
from tests.support.runtests import RUNTIME_VARS
from tests.support.sminion import create_sminion
PYTEST_GE_7 = getattr(_pytest._version, "version_tuple", (-1, -1)) >= (7, 0)
log = logging.getLogger(__name__)
@ -700,10 +696,6 @@ class EntropyGenerator:
if self.current_entropy >= self.minimum_entropy:
return
exc_kwargs = {}
if PYTEST_GE_7:
exc_kwargs["_use_item_location"] = True
rngd = shutil.which("rngd")
openssl = shutil.which("openssl")
timeout = time.time() + max_time
@ -718,7 +710,7 @@ class EntropyGenerator:
)
)
if self.skip:
raise pytest.skip.Exception(message, **exc_kwargs)
raise pytest.skip.Exception(message, _use_item_location=True)
raise pytest.fail(message)
subprocess.run([rngd, "-r", "/dev/urandom"], shell=False, check=True)
self.current_entropy = int(kernel_entropy_file.read_text().strip())
@ -736,7 +728,7 @@ class EntropyGenerator:
)
)
if self.skip:
raise pytest.skip.Exception(message, **exc_kwargs)
raise pytest.skip.Exception(message, _use_item_location=True)
raise pytest.fail(message)
target_file = tempfile.NamedTemporaryFile(
@ -768,7 +760,7 @@ class EntropyGenerator:
)
)
if self.skip:
raise pytest.skip.Exception(message, **exc_kwargs)
raise pytest.skip.Exception(message, _use_item_location=True)
raise pytest.fail(message)
def __enter__(self):