From e7c8f7698b83b9859d13d0692da9a052508ba203 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 20 Apr 2023 13:01:58 -0700 Subject: [PATCH] If the passed version begins with v, eg. it's a tag, remove it before comparison. --- tests/conftest.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 9e26a11..b24d90c 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,8 +1,9 @@ +import logging import os import pprint + import pytest import testinfra -import logging log = logging.getLogger(__name__) @@ -47,6 +48,8 @@ def target_python_version(): @pytest.fixture(scope="session") def target_salt_version(): target_salt = os.environ["KITCHEN_SUITE"].split("-", 2)[-1].replace("-", ".") + if target_salt.startswith("v"): + target_salt = target_salt[1:] if target_salt in ("latest", "master", "nightly"): pytest.skip("Don't have a specific salt version to test against") return target_salt