diff --git a/galaxy_ng/tests/integration/api/test_artifact_download.py b/galaxy_ng/tests/integration/api/test_artifact_download.py index df9fd5fffe..0c18b47873 100644 --- a/galaxy_ng/tests/integration/api/test_artifact_download.py +++ b/galaxy_ng/tests/integration/api/test_artifact_download.py @@ -18,6 +18,8 @@ # TODO Refactor get_client to provide access to bearer token +# FIXME: unskip when https://issues.redhat.com/browse/AAP-32675 is merged +@pytest.mark.skip_in_gw @pytest.mark.deployment_standalone @pytest.mark.installer_smoke_test def test_download_artifact(ansible_config, galaxy_client): diff --git a/galaxy_ng/tests/integration/api/test_artifact_upload.py b/galaxy_ng/tests/integration/api/test_artifact_upload.py index f730d6e72a..bbaf8b8839 100644 --- a/galaxy_ng/tests/integration/api/test_artifact_upload.py +++ b/galaxy_ng/tests/integration/api/test_artifact_upload.py @@ -275,6 +275,8 @@ def test_long_field_values(galaxy_client, field): assert fieldname in resp["error"]["description"] +# FIXME: unskip when https://issues.redhat.com/browse/AAP-32675 is merged +@pytest.mark.skip_in_gw @pytest.mark.parametrize( "spec", [ diff --git a/galaxy_ng/tests/integration/api/test_collection_delete.py b/galaxy_ng/tests/integration/api/test_collection_delete.py index 56ae000f9b..19736d7888 100644 --- a/galaxy_ng/tests/integration/api/test_collection_delete.py +++ b/galaxy_ng/tests/integration/api/test_collection_delete.py @@ -43,6 +43,8 @@ def test_delete_collection(galaxy_client, uncertifiedv2): get_collection(gc, cnamespace, cname, ckey[2]) +# FIXME: unskip when https://issues.redhat.com/browse/AAP-32675 is merged +@pytest.mark.skip_in_gw @pytest.mark.galaxyapi_smoke @pytest.mark.delete @pytest.mark.collection_version_delete @@ -88,6 +90,8 @@ def test_delete_collection_version(galaxy_client, uncertifiedv2): get_collection(gc, cnamespace, cname, ckey[2]) +# FIXME: unskip when https://issues.redhat.com/browse/AAP-32675 is merged +@pytest.mark.skip_in_gw @pytest.mark.delete @pytest.mark.min_hub_version("4.7dev") @pytest.mark.all diff --git a/galaxy_ng/tests/integration/api/test_collection_signing.py b/galaxy_ng/tests/integration/api/test_collection_signing.py index 6ccde8943c..84ca2333ed 100644 --- a/galaxy_ng/tests/integration/api/test_collection_signing.py +++ b/galaxy_ng/tests/integration/api/test_collection_signing.py @@ -69,6 +69,8 @@ def sign_on_demand(gc, signing_service, sign_url=None, **payload): return resp +# FIXME: unskip when https://issues.redhat.com/browse/AAP-32675 is merged +@pytest.mark.skip_in_gw @pytest.mark.collection_signing @pytest.mark.collection_move @pytest.mark.deployment_standalone @@ -141,6 +143,8 @@ def test_collection_auto_sign_on_approval(ansible_config, flags, galaxy_client, assert metadata["signatures"][0]["pubkey_fingerprint"] is not None +# FIXME: unskip when https://issues.redhat.com/browse/AAP-32675 is merged +@pytest.mark.skip_in_gw @pytest.mark.collection_signing @pytest.mark.deployment_standalone @pytest.mark.parametrize( @@ -328,6 +332,8 @@ def test_collection_move_with_signatures(ansible_config, flags, galaxy_client, s assert metadata["signatures"][0]["pubkey_fingerprint"] is not None +# FIXME: unskip when https://issues.redhat.com/browse/AAP-32675 is merged +@pytest.mark.skip_in_gw @pytest.mark.collection_signing @pytest.mark.collection_move @pytest.mark.deployment_standalone diff --git a/galaxy_ng/tests/integration/api/test_container_push_update.py b/galaxy_ng/tests/integration/api/test_container_push_update.py index efd9956938..14cd4f5db9 100644 --- a/galaxy_ng/tests/integration/api/test_container_push_update.py +++ b/galaxy_ng/tests/integration/api/test_container_push_update.py @@ -14,6 +14,8 @@ from galaxykit.utils import wait_for_task +# FIXME: unskip when https://issues.redhat.com/browse/AAP-32675 is merged +@pytest.mark.skip_in_gw @pytest.mark.deployment_standalone @pytest.mark.min_hub_version("4.7.1") @pytest.mark.min_hub_version("4.6.6") diff --git a/galaxy_ng/tests/integration/api/test_cross_repository_search.py b/galaxy_ng/tests/integration/api/test_cross_repository_search.py index 6a63f2ce1f..24085fda2e 100644 --- a/galaxy_ng/tests/integration/api/test_cross_repository_search.py +++ b/galaxy_ng/tests/integration/api/test_cross_repository_search.py @@ -4,6 +4,8 @@ from ..utils import get_client, SocialGithubClient +# FIXME: unskip when https://issues.redhat.com/browse/AAP-32675 is merged +@pytest.mark.skip_in_gw @pytest.mark.min_hub_version("4.7dev") @pytest.mark.all def test_x_repo_search_acl_basic_user(uncertifiedv2, galaxy_client, diff --git a/galaxy_ng/tests/integration/api/test_move.py b/galaxy_ng/tests/integration/api/test_move.py index fe8c4bd516..05bfbdeece 100644 --- a/galaxy_ng/tests/integration/api/test_move.py +++ b/galaxy_ng/tests/integration/api/test_move.py @@ -18,6 +18,8 @@ pytestmark = pytest.mark.qa # noqa: F821 +# FIXME: unskip when https://issues.redhat.com/browse/AAP-32675 is merged +@pytest.mark.skip_in_gw @pytest.mark.galaxyapi_smoke @pytest.mark.certification @pytest.mark.collection_move diff --git a/galaxy_ng/tests/integration/api/test_ui_paths_gateway.py b/galaxy_ng/tests/integration/api/test_ui_paths_gateway.py index 0cc6e8ed8a..aa2ba5c62c 100644 --- a/galaxy_ng/tests/integration/api/test_ui_paths_gateway.py +++ b/galaxy_ng/tests/integration/api/test_ui_paths_gateway.py @@ -78,6 +78,8 @@ def test_gw_api_ui_v1_collection_versions(galaxy_client, uncertifiedv2): validate_json(instance=cv_resp['metadata'], schema=schema_collectionversion_metadata) +# FIXME: unskip when https://issues.redhat.com/browse/AAP-32675 is merged +@pytest.mark.skip_in_gw @pytest.mark.deployment_standalone @pytest.mark.api_ui @pytest.mark.skipif(not aap_gateway(), reason="This test only runs if AAP Gateway is deployed") diff --git a/galaxy_ng/tests/integration/api/test_x_repo_search.py b/galaxy_ng/tests/integration/api/test_x_repo_search.py index 6db690c3e6..1e6963baab 100644 --- a/galaxy_ng/tests/integration/api/test_x_repo_search.py +++ b/galaxy_ng/tests/integration/api/test_x_repo_search.py @@ -400,6 +400,8 @@ def test_search_by_version(self, galaxy_client): expected = [{"repo_name": test_repo_name, "cv_name": artifact.name, "cv_version": version}] assert verify_repo_data(expected, results) + # FIXME: unskip when https://issues.redhat.com/browse/AAP-32675 is merged + @pytest.mark.skip_in_gw @pytest.mark.parametrize("is_highest,cv_version", [(True, "4.0.2"), (False, "4.0.1")]) @pytest.mark.x_repo_search def test_search_is_highest_true_false(self, galaxy_client, is_highest, cv_version): diff --git a/galaxy_ng/tests/integration/dab/test_dab_rbac.py b/galaxy_ng/tests/integration/dab/test_dab_rbac.py index 3cd556ed51..9665c1cfcf 100644 --- a/galaxy_ng/tests/integration/dab/test_dab_rbac.py +++ b/galaxy_ng/tests/integration/dab/test_dab_rbac.py @@ -140,6 +140,8 @@ def test_dab_rbac_repository_owner_by_user_or_team( assert result['state'] == 'completed' +# FIXME: unskip when https://issues.redhat.com/browse/AAP-32675 is merged +@pytest.mark.skip_in_gw @pytest.mark.deployment_standalone @pytest.mark.min_hub_version("4.10dev") @pytest.mark.skipif(