From 85df7340d1ba63599f5c88bbcd1b788d3efbdf8f Mon Sep 17 00:00:00 2001 From: James Tanner Date: Thu, 28 Mar 2024 11:21:56 -0400 Subject: [PATCH 1/4] Use pytest.raises context manager for aaiindex test. No-Issue Signed-off-by: James Tanner --- galaxy_ng/tests/integration/api/test_aiindex.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/galaxy_ng/tests/integration/api/test_aiindex.py b/galaxy_ng/tests/integration/api/test_aiindex.py index 2849ecd11a..eb9d990bd5 100644 --- a/galaxy_ng/tests/integration/api/test_aiindex.py +++ b/galaxy_ng/tests/integration/api/test_aiindex.py @@ -1,4 +1,5 @@ import pytest +import requests from ..utils import ( UIClient, @@ -147,6 +148,9 @@ def test_namespace_add_list_remove_aiindex(ansible_config, namespace, pe_namespa 7. Repeat step 2 with a basic user 8. Assert permission error raises """ + + #import epdb; epdb.st() + if not flags.get("ai_deny_index"): pytest.skip("ai_deny_index flag is not enabled") @@ -194,12 +198,11 @@ def test_namespace_add_list_remove_aiindex(ansible_config, namespace, pe_namespa # 7. Repeat step 2 with a basic user with UIClient(config=ansible_config("basic_user")) as uclient: # 8. Assert permission error raises - assert ( + with pytest.raises(requests.exceptions.HTTPError, match=r'.*403.*permission_denied.*') as excinfo: uclient.post( "_ui/v1/ai_deny_index/namespace/", payload={"reference": namespace} - ).status_code == 403 - ) + ) with UIClient(config=ansible_config("partner_engineer")) as uclient: # 9. add to the AI Index, a namespace owned by PE From 9bdf3931af2bc960b71afc1e0f650a51ced43718 Mon Sep 17 00:00:00 2001 From: James Tanner Date: Thu, 28 Mar 2024 11:22:59 -0400 Subject: [PATCH 2/4] Dead code. No-Issue Signed-off-by: James Tanner --- galaxy_ng/tests/integration/api/test_aiindex.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/galaxy_ng/tests/integration/api/test_aiindex.py b/galaxy_ng/tests/integration/api/test_aiindex.py index eb9d990bd5..dc6bd27c97 100644 --- a/galaxy_ng/tests/integration/api/test_aiindex.py +++ b/galaxy_ng/tests/integration/api/test_aiindex.py @@ -149,8 +149,6 @@ def test_namespace_add_list_remove_aiindex(ansible_config, namespace, pe_namespa 8. Assert permission error raises """ - #import epdb; epdb.st() - if not flags.get("ai_deny_index"): pytest.skip("ai_deny_index flag is not enabled") From f82632510de80afa79e99ea7ca9e055bb412669d Mon Sep 17 00:00:00 2001 From: James Tanner Date: Thu, 28 Mar 2024 11:23:30 -0400 Subject: [PATCH 3/4] Dead code. No-Issue Signed-off-by: James Tanner --- galaxy_ng/tests/integration/api/test_aiindex.py | 1 - 1 file changed, 1 deletion(-) diff --git a/galaxy_ng/tests/integration/api/test_aiindex.py b/galaxy_ng/tests/integration/api/test_aiindex.py index dc6bd27c97..f072baec98 100644 --- a/galaxy_ng/tests/integration/api/test_aiindex.py +++ b/galaxy_ng/tests/integration/api/test_aiindex.py @@ -148,7 +148,6 @@ def test_namespace_add_list_remove_aiindex(ansible_config, namespace, pe_namespa 7. Repeat step 2 with a basic user 8. Assert permission error raises """ - if not flags.get("ai_deny_index"): pytest.skip("ai_deny_index flag is not enabled") From 4a1f1774f09179e9c4cc8e38e17ddd093d0f4491 Mon Sep 17 00:00:00 2001 From: James Tanner Date: Thu, 28 Mar 2024 11:25:05 -0400 Subject: [PATCH 4/4] Lint fix. No-Issue Signed-off-by: James Tanner --- galaxy_ng/tests/integration/api/test_aiindex.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galaxy_ng/tests/integration/api/test_aiindex.py b/galaxy_ng/tests/integration/api/test_aiindex.py index f072baec98..9a565dea2f 100644 --- a/galaxy_ng/tests/integration/api/test_aiindex.py +++ b/galaxy_ng/tests/integration/api/test_aiindex.py @@ -195,7 +195,7 @@ def test_namespace_add_list_remove_aiindex(ansible_config, namespace, pe_namespa # 7. Repeat step 2 with a basic user with UIClient(config=ansible_config("basic_user")) as uclient: # 8. Assert permission error raises - with pytest.raises(requests.exceptions.HTTPError, match=r'.*403.*permission_denied.*') as excinfo: + with pytest.raises(requests.exceptions.HTTPError, match=r'.*403.*permission_denied.*'): uclient.post( "_ui/v1/ai_deny_index/namespace/", payload={"reference": namespace}