diff --git a/galaxy_ng/tests/integration/api/test_artifact_upload.py b/galaxy_ng/tests/integration/api/test_artifact_upload.py index 77838ebdf1..94785849a7 100644 --- a/galaxy_ng/tests/integration/api/test_artifact_upload.py +++ b/galaxy_ng/tests/integration/api/test_artifact_upload.py @@ -6,9 +6,10 @@ import pytest from orionutils.generator import build_collection, randstr +from pkg_resources import parse_version from galaxy_ng.tests.integration.constants import USERNAME_PUBLISHER -from ..conftest import is_hub_4_5 +from ..conftest import is_hub_4_5, get_hub_version from ..utils import ( CapturingGalaxyError, @@ -398,7 +399,12 @@ def test_ansible_lint_exception(ansible_config, upload_artifact): log_messages = [item["message"] for item in resp["messages"]] - linting_re = re.compile("Linting collection via ansible-lint") + pattern = "Linting collection via ansible-lint" # hub 4.8, galaxy-importer 0.4.11 + hub_version = get_hub_version(ansible_config) + if parse_version(hub_version) < parse_version('4.8'): + pattern = "Linting role .* via ansible-lint" # 4.7, galaxy-importer 0.4.7 + + linting_re = re.compile(pattern) linting = [item for item in log_messages if linting_re.match(item)] assert len(linting) == 1 # linting occurred