From 08dc2d69219afe761780cbe3f4d68a6c9aed92ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Je=C5=99=C3=A1bek=20=28Jiri=20Jerabek=29?=
 <Jerabekjirka@email.cz>
Date: Tue, 3 Sep 2024 15:53:01 +0200
Subject: [PATCH] More test GW skipping (#2251)

* skip more
* fix linter
* relogin=False
* add trailing slash
No-Issue
---
 galaxy_ng/tests/integration/api/test_auth.py              | 1 +
 galaxy_ng/tests/integration/dab/test_dab_rbac_contract.py | 1 +
 galaxy_ng/tests/integration/dab/test_ui_v2.py             | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/galaxy_ng/tests/integration/api/test_auth.py b/galaxy_ng/tests/integration/api/test_auth.py
index 8348d686d9..c0b6c3045c 100644
--- a/galaxy_ng/tests/integration/api/test_auth.py
+++ b/galaxy_ng/tests/integration/api/test_auth.py
@@ -132,6 +132,7 @@ def test_gateway_token_auth(galaxy_client):
 
 @pytest.mark.deployment_standalone
 @pytest.mark.skip_in_gw
+@pytest.mark.skipif(not aap_gateway(), reason="This test can't run if AAP Gateway is deployed")
 def test_ui_login_csrftoken(galaxy_client):
     if is_keycloak():
         pytest.skip("This test is not valid for keycloak")
diff --git a/galaxy_ng/tests/integration/dab/test_dab_rbac_contract.py b/galaxy_ng/tests/integration/dab/test_dab_rbac_contract.py
index d870c505f3..92f1ba8065 100644
--- a/galaxy_ng/tests/integration/dab/test_dab_rbac_contract.py
+++ b/galaxy_ng/tests/integration/dab/test_dab_rbac_contract.py
@@ -640,6 +640,7 @@ def test_group_sync_from_pulp_to_dab(galaxy_client, assert_user_in_group, user_a
     assert_user_in_group(user["id"], group["id"], expected=False)
 
 
+@pytest.mark.skip(reason="FIXME - skip until resource management is decided")
 def test_team_member_sync_from_dab_to_pulp(galaxy_client, assert_user_in_group, user_and_group):
     gc = galaxy_client("admin")
     user, group = user_and_group
diff --git a/galaxy_ng/tests/integration/dab/test_ui_v2.py b/galaxy_ng/tests/integration/dab/test_ui_v2.py
index 994bbbaf21..26f637caa3 100644
--- a/galaxy_ng/tests/integration/dab/test_ui_v2.py
+++ b/galaxy_ng/tests/integration/dab/test_ui_v2.py
@@ -228,7 +228,7 @@ def test_ui_v2_teams(
     assert team["name"] == team_name
 
     # Check that associated group exists
-    group = client.get(f"_ui/v1/groups/{team['group']['id']}")
+    group = client.get(f"_ui/v1/groups/{team['group']['id']}/")
     assert group["id"] == team["group"]["id"]
     assert group["name"] == f"Default::{team_name}"
 
@@ -243,7 +243,7 @@ def test_ui_v2_teams(
 
     # Check that associated group does not exist
     with pytest.raises(GalaxyClientError) as ctx:
-        client.get(f"_ui/v1/groups/{team['group']['id']}")
+        client.get(f"_ui/v1/groups/{team['group']['id']}/")
     assert ctx.value.response.status_code == HTTPStatus.NOT_FOUND