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

Fix version checks

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-01-10 10:44:21 +00:00 • committed by Megan Wilhite
parent e8555a0313
commit d9604f15e8
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
tests/pytests/unit/fileserver/gitfs/test_gitfs.py
View file

@ -32,14 +32,6 @@ import salt.utils.gitfs
import salt.utils.platform
import salt.utils.win_functions
import salt.utils.yaml
from salt.utils.gitfs import (
GITPYTHON_MINVER,
GITPYTHON_VERSION,
LIBGIT2_MINVER,
LIBGIT2_VERSION,
PYGIT2_MINVER,
PYGIT2_VERSION,
)
from tests.support.helpers import patched_environ
from tests.support.mock import patch
@ -56,12 +48,20 @@ try:
# actually import it. But we don't need import pygit2 in this module, we
# can just use the Version instances imported along with
# salt.utils.gitfs to check if we have a compatible version.
HAS_GITPYTHON = GITPYTHON_VERSION >= GITPYTHON_MINVER
HAS_GITPYTHON = (
salt.utils.gitfs.GITPYTHON_VERSION
and salt.utils.gitfs.GITPYTHON_VERSION >= salt.utils.gitfs.GITPYTHON_MINVER
)
except (ImportError, AttributeError):
HAS_GITPYTHON = False
try:
HAS_PYGIT2 = PYGIT2_VERSION >= PYGIT2_MINVER and LIBGIT2_VERSION >= LIBGIT2_MINVER
HAS_PYGIT2 = (
salt.utils.gitfs.PYGIT2_VERSION
and salt.utils.gitfs.PYGIT2_VERSION >= salt.utils.gitfs.PYGIT2_MINVER
and salt.utils.gitfs.LIBGIT2_VERSION
and salt.utils.gitfs.LIBGIT2_VERSION >= salt.utils.gitfs.LIBGIT2_MINVER
)
except AttributeError:
HAS_PYGIT2 = False
@ -72,13 +72,15 @@ log = logging.getLogger(__name__)
def provider(request):
if not HAS_GITPYTHON:
pytest.skip(
"GitPython >= {} required for temp repo setup".format(GITPYTHON_MINVER)
"GitPython >= {} required for temp repo setup".format(
salt.utils.gitfs.GITPYTHON_MINVER
)
)
if request.param == "pygit2":
if not HAS_PYGIT2:
pytest.skip(
"pygit2 >= {} and libgit2 >= {} required".format(
PYGIT2_MINVER, LIBGIT2_MINVER
salt.utils.gitfs.PYGIT2_MINVER, salt.utils.gitfs.LIBGIT2_MINVER
)
)
if salt.utils.platform.is_windows():

4
tests/unit/utils/test_gitfs.py
View file

@ -20,7 +20,9 @@ from tests.support.unit import TestCase
try:
HAS_PYGIT2 = (
salt.utils.gitfs.PYGIT2_VERSION >= salt.utils.gitfs.PYGIT2_MINVER
salt.utils.gitfs.PYGIT2_VERSION
and salt.utils.gitfs.PYGIT2_VERSION >= salt.utils.gitfs.PYGIT2_MINVER
and salt.utils.gitfs.LIBGIT2_VERSION
and salt.utils.gitfs.LIBGIT2_VERSION >= salt.utils.gitfs.LIBGIT2_MINVER
)
except AttributeError: