Skip to content

Commit

Permalink
skip 2.5 tests in 2.4 pipelines
Browse files Browse the repository at this point in the history
No-Issue
  • Loading branch information
jerabekjiri committed Aug 20, 2024
1 parent 4281733 commit beec419
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 1 deletion.
2 changes: 1 addition & 1 deletion galaxy_ng/tests/integration/api/test_ui_paths.py
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ def test_api_ui_v1_collection_detail_view(ansible_config, published):
# /api/automation-hub/_ui/v1/settings/
@pytest.mark.deployment_standalone
@pytest.mark.api_ui
@pytest.mark.min_hub_version("4.6dev")
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.skip_in_gw
def test_api_ui_v1_settings(ansible_config):

Expand Down
3 changes: 3 additions & 0 deletions galaxy_ng/tests/integration/dab/test_dab_rbac.py
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ def test_dab_rbac_namespace_owner_by_team(


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
def test_dab_user_platform_auditor_bidirectional_sync(
settings,
galaxy_client,
Expand Down Expand Up @@ -332,6 +333,7 @@ def test_dab_user_platform_auditor_bidirectional_sync(


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
def test_dab_team_platform_auditor_bidirectional_sync(
settings,
galaxy_client,
Expand Down Expand Up @@ -434,6 +436,7 @@ def test_dab_team_platform_auditor_bidirectional_sync(


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
def test_dab_user_assignment_filtering_as_user(
settings,
galaxy_client,
Expand Down
8 changes: 8 additions & 0 deletions galaxy_ng/tests/integration/dab/test_dab_rbac_contract.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

# This tests the basic DAB RBAC contract using custom roles to do things.
@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
def test_list_namespace_permissions(galaxy_client):
gc = galaxy_client("admin")
r = gc.get("_ui/v2/role_metadata/")
Expand All @@ -29,6 +30,7 @@ def test_list_namespace_permissions(galaxy_client):

# look for the content_type choices
@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
def test_role_definition_options(galaxy_client):
gc = galaxy_client("admin")
# TODO: add support for options in GalaxyClient in galaxykit
Expand Down Expand Up @@ -216,6 +218,7 @@ def check_system_role_user_assignments(client: GalaxyClient, user: dict, role: d


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.parametrize("by_api", ["dab", "pulp"])
def test_create_custom_namespace_system_admin_role(custom_role_factory, galaxy_client, by_api):
if by_api == "dab":
Expand All @@ -238,6 +241,7 @@ def test_create_custom_namespace_system_admin_role(custom_role_factory, galaxy_c


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
def test_give_user_custom_role_system(galaxy_client, custom_role_factory, namespace):
# TODO: verify that assignment is seen in pulp API (HOW?)
# Step 0: Setup test.
Expand Down Expand Up @@ -302,6 +306,7 @@ def test_give_user_custom_role_system(galaxy_client, custom_role_factory, namesp


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
def test_give_team_custom_role_system(
settings,
galaxy_client,
Expand Down Expand Up @@ -376,6 +381,7 @@ def test_give_team_custom_role_system(

# TODO: We need another version of it for a team
@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.parametrize("by_role_api", ["dab", "pulp"])
@pytest.mark.parametrize("by_assignment_api", ["dab", "pulp"])
def test_give_user_custom_role_object(
Expand Down Expand Up @@ -462,6 +468,7 @@ def test_give_user_custom_role_object(
assert_object_role_assignments(gc, user, namespace, 0)


@pytest.mark.min_hub_version("4.10dev")
def test_object_role_permission_validation(galaxy_client, custom_role_factory, namespace):
gc = galaxy_client("admin")

Expand Down Expand Up @@ -536,6 +543,7 @@ def assure_user_not_in_group():
return (user, group)


@pytest.mark.min_hub_version("4.10dev")
def test_group_sync_from_pulp_to_dab(galaxy_client, assert_user_in_group, user_and_group):
gc = galaxy_client("admin")
user, group = user_and_group
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
def test_dab_rbac_pagination(galaxy_client):
gc = galaxy_client("admin", ignore_cache=True)
roledefs = gc.get('_ui/v2/role_definitions/?page_size=1')
Expand Down
5 changes: 5 additions & 0 deletions galaxy_ng/tests/integration/dab/test_ui_v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.parametrize("user_payload", [
{},
{"email": "[email protected]"},
Expand Down Expand Up @@ -61,6 +62,7 @@ def test_ui_v2_user_create(


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.parametrize("user_payload", [
{"groups": [{"name": "$RANDOM"}]},
{"teams": [{"name": "$RANDOM", "organization": "$RANDOM"}]},
Expand Down Expand Up @@ -170,6 +172,7 @@ def test_ui_v2_user_create_with_groups_and_teams_and_orgs(


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.parametrize("invalid_payload", [
({"email": "invalidemail"}, "Enter a valid email address."),
({"email": "@whoops"}, "Enter a valid email address."),
Expand Down Expand Up @@ -214,6 +217,7 @@ def test_ui_v2_user_create_invalid_data(


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
def test_ui_v2_user_edit(
settings,
galaxy_client,
Expand Down Expand Up @@ -256,6 +260,7 @@ def test_ui_v2_user_edit(


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.parametrize("invalid_payload", [
({"email": "invalidemail"}, "Enter a valid email address."),
({"email": "@whoops"}, "Enter a valid email address."),
Expand Down

0 comments on commit beec419

Please sign in to comment.