From 4e24fc0c13d3c7d92304d744450334ccf7e17806 Mon Sep 17 00:00:00 2001
From: Christian <ctorrens@redhat.com>
Date: Thu, 21 Mar 2024 12:38:05 +0100
Subject: [PATCH] fix tests No-Issue

---
 galaxy_ng/tests/integration/api/test_groups.py  |  6 ++++--
 .../tests/integration/api/test_ui_paths.py      | 17 ++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/galaxy_ng/tests/integration/api/test_groups.py b/galaxy_ng/tests/integration/api/test_groups.py
index 77fdaa6ef5..ba9a9b5e08 100644
--- a/galaxy_ng/tests/integration/api/test_groups.py
+++ b/galaxy_ng/tests/integration/api/test_groups.py
@@ -8,6 +8,7 @@
 import uuid
 
 import pytest
+from requests import HTTPError
 
 from galaxykit.groups import create_group_v3, create_group, get_roles, \
     delete_group_v3, get_group_v3
@@ -121,5 +122,6 @@ def test_group_role_listing(ansible_config, test_data):
         del_group_resp = uclient.delete(f'pulp/api/v3/groups/{group_response["id"]}/')
         assert del_group_resp.status_code == 204
 
-        detail_group_response = uclient.get(f'pulp/api/v3/groups/{group_response["id"]}/')
-        assert detail_group_response.status_code == 404
+        with pytest.raises(HTTPError) as ctx:
+            uclient.get(f'pulp/api/v3/groups/{group_response["id"]}/')
+        assert ctx.value.strerror.status_code == 404
diff --git a/galaxy_ng/tests/integration/api/test_ui_paths.py b/galaxy_ng/tests/integration/api/test_ui_paths.py
index 6a7018e4e4..1622d71f9c 100644
--- a/galaxy_ng/tests/integration/api/test_ui_paths.py
+++ b/galaxy_ng/tests/integration/api/test_ui_paths.py
@@ -9,6 +9,7 @@
 from orionutils.generator import build_collection
 from ansible.galaxy.api import GalaxyError
 from jsonschema import validate as validate_json
+from requests import HTTPError
 
 from ..constants import DEFAULT_DISTROS, USERNAME_PUBLISHER
 from ..schemas import (
@@ -163,8 +164,9 @@ def test_api_ui_v1_collection_versions_version_range(ansible_config, uncertified
         assert ds['data'][0]["version"] == c2.version
 
         # test invalid
-        resp = uclient.get(f'{v_path}&version_range=not_a_semver_version')
-        assert resp.status_code == 400
+        with pytest.raises(HTTPError) as ctx:
+            uclient.get(f'{v_path}&version_range=not_a_semver_version')
+        assert ctx.value.strerror.status_code == 400
 
 
 # /api/automation-hub/_ui/v1/collection-versions/{version}/
@@ -325,9 +327,9 @@ def test_api_ui_v1_execution_environments_registries(ansible_config):
         assert resp.status_code == 204
 
         # make sure it's gone
-        resp = uclient.get(f"_ui/v1/execution-environments/registries/{id}/")
-        assert resp.status_code == 404
-
+        with pytest.raises(HTTPError) as ctx:
+            uclient.get(f"_ui/v1/execution-environments/registries/{id}/")
+        assert ctx.value.strerror.status_code == 404
 
 # /api/automation-hub/_ui/v1/execution-environments/registries/{pulp_id}/
 # ^ tested by previous function
@@ -713,8 +715,9 @@ def test_api_ui_v1_remotes_by_id(ansible_config):
         # FIXME - there is no suitable pulp_id for a remote?
         pulp_ids = [x['pk'] for x in ds['data']]
         for pulp_id in pulp_ids:
-            resp = uclient.get('_ui/v1/remotes/{pulp_id}/')
-            assert resp.status_code == 404
+            with pytest.raises(HTTPError) as ctx:
+                uclient.get('_ui/v1/remotes/{pulp_id}/')
+            assert ctx.value.strerror.status_code == 404
 
 
 # /api/automation-hub/_ui/v1/repo/{distro_base_path}/