diff --git a/galaxy_ng/tests/integration/api/test_collection_signing.py b/galaxy_ng/tests/integration/api/test_collection_signing.py index 0a57f7aa0d..c5e07a0121 100644 --- a/galaxy_ng/tests/integration/api/test_collection_signing.py +++ b/galaxy_ng/tests/integration/api/test_collection_signing.py @@ -14,7 +14,6 @@ from orionutils.generator import build_collection -from galaxy_ng.tests.integration.utils.iqe_utils import require_signature_for_approval from galaxy_ng.tests.integration.constants import SLEEP_SECONDS_ONETIME from galaxy_ng.tests.integration.utils import ( build_collection as galaxy_build_collection, @@ -550,9 +549,8 @@ def test_move_with_no_signing_service_not_superuser_signature_required( assert gc.get(f"v3/collections?name={artifact.name}")["meta"]["count"] == 1 -@pytest.mark.skipif(not require_signature_for_approval(), - reason="GALAXY_REQUIRE_SIGNATURE_FOR_APPROVAL is required to be enabled") -def test_move_with_no_signing_service(flags, galaxy_client, settings, artifact): +def test_move_with_no_signing_service(flags, galaxy_client, settings, artifact, + skip_if_not_require_signature_for_approval): """ Test signature validation on the pulp {repo_href}/move_collection_version/ api when signatures are required. @@ -611,9 +609,8 @@ def test_move_with_no_signing_service(flags, galaxy_client, settings, artifact): assert gc.get(f"v3/collections?name={artifact.name}")["meta"]["count"] == 1 -@pytest.mark.skipif(not require_signature_for_approval(), - reason="GALAXY_REQUIRE_SIGNATURE_FOR_APPROVAL is required to be enabled") -def test_move_with_signing_service(flags, galaxy_client, settings, artifact): +def test_move_with_signing_service(flags, galaxy_client, settings, artifact, + skip_if_not_require_signature_for_approval): """ Test signature validation on the pulp {repo_href}/move_collection_version/ api when signatures are required. diff --git a/galaxy_ng/tests/integration/cli/test_cli_flow.py b/galaxy_ng/tests/integration/cli/test_cli_flow.py index ca8072b731..e5c94dc10f 100644 --- a/galaxy_ng/tests/integration/cli/test_cli_flow.py +++ b/galaxy_ng/tests/integration/cli/test_cli_flow.py @@ -2,7 +2,6 @@ import logging import pytest -from ..utils.iqe_utils import require_signature_for_approval from ..utils import ansible_galaxy from ..utils import get_collection_full_path from ..utils import CollectionInspector @@ -108,14 +107,12 @@ def test_publish_and_install_by_self(galaxy_client, published, cleanup_collectio @pytest.mark.all @pytest.mark.cli @pytest.mark.deployment_cloud -@pytest.mark.skipif(require_signature_for_approval(), reason="This test needs refactoring to " - "work with signatures required " - "on move.") def test_publish_and_expect_uncertified_hidden( ansible_config, published, cleanup_collections, - settings + settings, + skip_if_require_signature_for_approval ): """A discovering/consumer user has the permission to download a specific version of an uncertified collection, but not an unspecified version range. diff --git a/galaxy_ng/tests/integration/utils/iqe_utils.py b/galaxy_ng/tests/integration/utils/iqe_utils.py index 20130ca885..e76b041e12 100755 --- a/galaxy_ng/tests/integration/utils/iqe_utils.py +++ b/galaxy_ng/tests/integration/utils/iqe_utils.py @@ -693,7 +693,6 @@ def get_vault_loader(): return VaultSecretFetcher.from_settings(vault_settings) -@lru_cache() def require_signature_for_approval(): ansible_config = get_ansible_config() galaxy_client = get_galaxy_client(ansible_config)