From ab9f8b8c2d6b2d795b5dec3dfee2dd10cd5360e3 Mon Sep 17 00:00:00 2001 From: Menachem Date: Mon, 24 Feb 2025 21:57:59 +0200 Subject: [PATCH 1/2] [get_client_test] Fix UT --- .../commands/common/clients/tests/get_client_test.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/demisto_sdk/commands/common/clients/tests/get_client_test.py b/demisto_sdk/commands/common/clients/tests/get_client_test.py index 7be44797404..20fb6fa29fc 100644 --- a/demisto_sdk/commands/common/clients/tests/get_client_test.py +++ b/demisto_sdk/commands/common/clients/tests/get_client_test.py @@ -273,7 +273,7 @@ def _xsoar_generic_request_side_effect( ) -def test_get_client_from_server_type_base_url_is_not_api_url(mocker): +def test_get_client_from_server_type_base_url_is_not_api_url(mocker, requests_mock): """ Given: - /ioc-rules endpoint that is not valid @@ -300,10 +300,16 @@ def _xsoar_generic_request_side_effect( mocker.patch.object( DefaultApi, "generic_request", side_effect=_xsoar_generic_request_side_effect ) + base_url = "https://test5.com" + requests_mock.get( + f"{base_url}/public_api/v1/healthcheck", + json={"status": "available"}, + status_code=200, + ) with pytest.raises(ValueError): get_client_from_server_type( - base_url="https://test5.com", api_key="test", auth_id="1" + base_url=base_url, api_key="test", auth_id="1" ) From 575b529d4d8ecd36a8e754b9729f72a64ed477bf Mon Sep 17 00:00:00 2001 From: Menachem Date: Tue, 25 Feb 2025 10:57:10 +0200 Subject: [PATCH 2/2] Add changelog --- .changelog/4833.yml | 4 ++++ demisto_sdk/commands/common/clients/tests/get_client_test.py | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 .changelog/4833.yml diff --git a/.changelog/4833.yml b/.changelog/4833.yml new file mode 100644 index 00000000000..72d48e91379 --- /dev/null +++ b/.changelog/4833.yml @@ -0,0 +1,4 @@ +changes: +- description: Fixed an issue where some unit-tests failed in github-actions CI. + type: internal +pr_number: 4833 diff --git a/demisto_sdk/commands/common/clients/tests/get_client_test.py b/demisto_sdk/commands/common/clients/tests/get_client_test.py index 20fb6fa29fc..4132e4ff7c5 100644 --- a/demisto_sdk/commands/common/clients/tests/get_client_test.py +++ b/demisto_sdk/commands/common/clients/tests/get_client_test.py @@ -308,9 +308,7 @@ def _xsoar_generic_request_side_effect( ) with pytest.raises(ValueError): - get_client_from_server_type( - base_url=base_url, api_key="test", auth_id="1" - ) + get_client_from_server_type(base_url=base_url, api_key="test", auth_id="1") @pytest.mark.parametrize(