From bd7320c1ea351651c654024187d60a31fe44142d Mon Sep 17 00:00:00 2001 From: jo Date: Fri, 15 Aug 2025 17:12:58 +0200 Subject: [PATCH] test: add global action fixtures --- tests/unit/actions/conftest.py | 79 ----------- tests/unit/actions/test_client.py | 159 ++++++++++------------- tests/unit/certificates/test_client.py | 8 +- tests/unit/conftest.py | 106 +++++++++++++-- tests/unit/floating_ips/test_client.py | 40 +++--- tests/unit/images/test_client.py | 16 +-- tests/unit/load_balancers/test_client.py | 16 +-- tests/unit/networks/test_client.py | 60 ++++----- tests/unit/primary_ips/test_client.py | 40 +++--- tests/unit/servers/test_client.py | 124 +++++++++--------- tests/unit/ssh_keys/test_client.py | 8 +- tests/unit/volumes/test_client.py | 44 +++---- 12 files changed, 339 insertions(+), 361 deletions(-) delete mode 100644 tests/unit/actions/conftest.py diff --git a/tests/unit/actions/conftest.py b/tests/unit/actions/conftest.py deleted file mode 100644 index dbc3cc9f..00000000 --- a/tests/unit/actions/conftest.py +++ /dev/null @@ -1,79 +0,0 @@ -from __future__ import annotations - -import pytest - - -@pytest.fixture() -def generic_action_list(): - return { - "actions": [ - { - "id": 1, - "command": "start_server", - "status": "success", - "progress": 100, - "started": "2016-01-30T23:55:00+00:00", - "finished": "2016-01-30T23:56:00+00:00", - "resources": [{"id": 42, "type": "server"}], - "error": {"code": "action_failed", "message": "Action failed"}, - }, - { - "id": 2, - "command": "stop_server", - "status": "success", - "progress": 100, - "started": "2016-01-30T23:55:00+00:00", - "finished": "2016-01-30T23:56:00+00:00", - "resources": [{"id": 42, "type": "server"}], - "error": {"code": "action_failed", "message": "Action failed"}, - }, - ] - } - - -@pytest.fixture() -def running_action(): - return { - "action": { - "id": 2, - "command": "stop_server", - "status": "running", - "progress": 100, - "started": "2016-01-30T23:55:00+00:00", - "finished": "2016-01-30T23:56:00+00:00", - "resources": [{"id": 42, "type": "server"}], - "error": {"code": "action_failed", "message": "Action failed"}, - } - } - - -@pytest.fixture() -def successfully_action(): - return { - "action": { - "id": 2, - "command": "stop_server", - "status": "success", - "progress": 100, - "started": "2016-01-30T23:55:00+00:00", - "finished": "2016-01-30T23:56:00+00:00", - "resources": [{"id": 42, "type": "server"}], - "error": {"code": "action_failed", "message": "Action failed"}, - } - } - - -@pytest.fixture() -def failed_action(): - return { - "action": { - "id": 2, - "command": "stop_server", - "status": "error", - "progress": 100, - "started": "2016-01-30T23:55:00+00:00", - "finished": "2016-01-30T23:56:00+00:00", - "resources": [{"id": 42, "type": "server"}], - "error": {"code": "action_failed", "message": "Action failed"}, - } - } diff --git a/tests/unit/actions/test_client.py b/tests/unit/actions/test_client.py index 761452d0..389d06f7 100644 --- a/tests/unit/actions/test_client.py +++ b/tests/unit/actions/test_client.py @@ -6,7 +6,6 @@ from hcloud import Client from hcloud.actions import ( - Action, ActionFailedException, ActionsClient, ActionTimeoutException, @@ -14,68 +13,79 @@ ResourceActionsClient, ) +from ..conftest import assert_bound_action1, assert_bound_action2 + class TestBoundAction: @pytest.fixture() - def bound_running_action(self, client: Client): - return BoundAction( - client=client.actions, - data=dict(id=14, status=Action.STATUS_RUNNING), - ) + def bound_running_action(self, client: Client, action1_running): + return BoundAction(client=client.actions, data=action1_running) def test_wait_until_finished( self, request_mock: mock.MagicMock, bound_running_action, - running_action, - successfully_action, + action1_running, + action1_success, ): request_mock.side_effect = [ - running_action, - successfully_action, + {"action": action1_running}, + {"action": action1_success}, ] bound_running_action.wait_until_finished() request_mock.assert_called_with( method="GET", - url="/actions/2", + url="/actions/1", ) assert bound_running_action.status == "success" + assert bound_running_action.id == 1 + assert request_mock.call_count == 2 def test_wait_until_finished_with_error( self, request_mock: mock.MagicMock, bound_running_action, - running_action, - failed_action, + action1_running, + action1_error, ): - request_mock.side_effect = [running_action, failed_action] - with pytest.raises(ActionFailedException) as exception_info: + request_mock.side_effect = [ + {"action": action1_running}, + {"action": action1_error}, + ] + + with pytest.raises(ActionFailedException) as exc: bound_running_action.wait_until_finished() assert bound_running_action.status == "error" - assert exception_info.value.action.id == 2 + assert bound_running_action.id == 1 + assert exc.value.action.id == 1 + + assert request_mock.call_count == 2 def test_wait_until_finished_max_retries( self, request_mock: mock.MagicMock, bound_running_action, - running_action, - successfully_action, + action1_running, + action1_success, ): request_mock.side_effect = [ - running_action, - running_action, - successfully_action, + {"action": action1_running}, + {"action": action1_running}, + {"action": action1_success}, ] - with pytest.raises(ActionTimeoutException) as exception_info: + + with pytest.raises(ActionTimeoutException) as exc: bound_running_action.wait_until_finished(max_retries=1) assert bound_running_action.status == "running" - assert exception_info.value.action.id == 2 + assert bound_running_action.id == 1 + assert exc.value.action.id == 1 + assert request_mock.call_count == 1 @@ -88,9 +98,9 @@ def test_get_by_id( self, request_mock: mock.MagicMock, actions_client: ActionsClient, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = actions_client.get_by_id(1) @@ -98,22 +108,24 @@ def test_get_by_id( method="GET", url="/resource/actions/1", ) - assert action._client == actions_client._parent.actions - assert action.id == 1 - assert action.command == "stop_server" + + assert_bound_action1(action, actions_client._parent.actions) @pytest.mark.parametrize( "params", - [{}, {"status": ["active"], "sort": ["status"], "page": 2, "per_page": 10}], + [ + {}, + {"status": ["active"], "sort": ["status"], "page": 2, "per_page": 10}, + ], ) def test_get_list( self, request_mock: mock.MagicMock, actions_client: ActionsClient, - generic_action_list, + action_list_response, params, ): - request_mock.return_value = generic_action_list + request_mock.return_value = action_list_response result = actions_client.get_list(**params) @@ -127,50 +139,30 @@ def test_get_list( actions = result.actions assert len(actions) == 2 - - action1 = actions[0] - action2 = actions[1] - - assert action1._client == actions_client._parent.actions - assert action1.id == 1 - assert action1.command == "start_server" - - assert action2._client == actions_client._parent.actions - assert action2.id == 2 - assert action2.command == "stop_server" + assert_bound_action1(actions[0], actions_client._parent.actions) + assert_bound_action2(actions[1], actions_client._parent.actions) @pytest.mark.parametrize("params", [{}, {"status": ["active"], "sort": ["status"]}]) def test_get_all( self, request_mock: mock.MagicMock, actions_client: ActionsClient, - generic_action_list, + action_list_response, params, ): - request_mock.return_value = generic_action_list + request_mock.return_value = action_list_response actions = actions_client.get_all(**params) - params.update({"page": 1, "per_page": 50}) - request_mock.assert_called_with( method="GET", url="/resource/actions", - params=params, + params={**params, "page": 1, "per_page": 50}, ) assert len(actions) == 2 - - action1 = actions[0] - action2 = actions[1] - - assert action1._client == actions_client._parent.actions - assert action1.id == 1 - assert action1.command == "start_server" - - assert action2._client == actions_client._parent.actions - assert action2.id == 2 - assert action2.command == "stop_server" + assert_bound_action1(actions[0], actions_client._parent.actions) + assert_bound_action2(actions[1], actions_client._parent.actions) class TestActionsClient: @@ -182,9 +174,9 @@ def test_get_by_id( self, request_mock: mock.MagicMock, actions_client: ActionsClient, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = actions_client.get_by_id(1) @@ -192,22 +184,23 @@ def test_get_by_id( method="GET", url="/actions/1", ) - assert action._client == actions_client._parent.actions - assert action.id == 1 - assert action.command == "stop_server" + assert_bound_action1(action, actions_client._parent.actions) @pytest.mark.parametrize( "params", - [{}, {"status": ["active"], "sort": ["status"], "page": 2, "per_page": 10}], + [ + {}, + {"status": ["active"], "sort": ["status"], "page": 2, "per_page": 10}, + ], ) def test_get_list( self, request_mock: mock.MagicMock, actions_client: ActionsClient, - generic_action_list, + action_list_response, params, ): - request_mock.return_value = generic_action_list + request_mock.return_value = action_list_response with pytest.deprecated_call(): result = actions_client.get_list(**params) @@ -222,48 +215,28 @@ def test_get_list( actions = result.actions assert len(actions) == 2 - - action1 = actions[0] - action2 = actions[1] - - assert action1._client == actions_client._parent.actions - assert action1.id == 1 - assert action1.command == "start_server" - - assert action2._client == actions_client._parent.actions - assert action2.id == 2 - assert action2.command == "stop_server" + assert_bound_action1(actions[0], actions_client._parent.actions) + assert_bound_action2(actions[1], actions_client._parent.actions) @pytest.mark.parametrize("params", [{}, {"status": ["active"], "sort": ["status"]}]) def test_get_all( self, request_mock: mock.MagicMock, actions_client: ActionsClient, - generic_action_list, + action_list_response, params, ): - request_mock.return_value = generic_action_list + request_mock.return_value = action_list_response with pytest.deprecated_call(): actions = actions_client.get_all(**params) - params.update({"page": 1, "per_page": 50}) - request_mock.assert_called_with( method="GET", url="/actions", - params=params, + params={**params, "page": 1, "per_page": 50}, ) assert len(actions) == 2 - - action1 = actions[0] - action2 = actions[1] - - assert action1._client == actions_client._parent.actions - assert action1.id == 1 - assert action1.command == "start_server" - - assert action2._client == actions_client._parent.actions - assert action2.id == 2 - assert action2.command == "stop_server" + assert_bound_action1(actions[0], actions_client._parent.actions) + assert_bound_action2(actions[1], actions_client._parent.actions) diff --git a/tests/unit/certificates/test_client.py b/tests/unit/certificates/test_client.py index 0c7c8c7f..26434074 100644 --- a/tests/unit/certificates/test_client.py +++ b/tests/unit/certificates/test_client.py @@ -118,9 +118,9 @@ def test_delete( self, request_mock: mock.MagicMock, bound_certificate, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response delete_success = bound_certificate.delete() @@ -362,9 +362,9 @@ def test_delete( request_mock: mock.MagicMock, certificates_client: CertificatesClient, certificate, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response delete_success = certificates_client.delete(certificate) diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index ce6adbe6..1e9a75b3 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -7,6 +7,7 @@ import pytest from hcloud import Client +from hcloud.actions import ActionsClient, BoundAction @pytest.fixture(autouse=True, scope="session") @@ -32,17 +33,100 @@ def client(request_mock) -> Client: return c +def assert_bound_action1(o: BoundAction, client: ActionsClient): + assert o.id == 1 + assert o.command == "command" + assert o._client == client + + +def assert_bound_action2(o: BoundAction, client: ActionsClient): + assert o.id == 2 + assert o.command == "command" + assert o._client == client + + +@pytest.fixture() +def action1_running(): + return { + "id": 1, + "command": "command", + "status": "running", + "progress": 0, + "started": "2016-01-30T23:50+00:00", + "finished": None, + "resources": [{"id": 42, "type": "resource"}], + "error": None, + } + + +@pytest.fixture() +def action2_running(): + return { + "id": 2, + "command": "command", + "status": "running", + "progress": 20, + "started": "2016-01-30T23:50+00:00", + "finished": None, + "resources": [{"id": 43, "type": "resource"}], + "error": None, + } + + +@pytest.fixture() +def action1_success(action1_running): + return { + **action1_running, + "status": "success", + "progress": 100, + "finished": "2016-01-31T00:10+00:00", + } + + +@pytest.fixture() +def action2_success(action2_running): + return { + **action2_running, + "status": "success", + "progress": 100, + "finished": "2016-01-31T00:10+00:00", + } + + +@pytest.fixture() +def action1_error(action1_running): + return { + **action1_running, + "status": "error", + "progress": 100, + "finished": "2016-01-31T00:10+00:00", + "error": {"code": "action_failed", "message": "Action failed"}, + } + + +@pytest.fixture() +def action2_error(action2_running): + return { + **action2_running, + "status": "error", + "progress": 100, + "finished": "2016-01-31T00:10+00:00", + "error": {"code": "action_failed", "message": "Action failed"}, + } + + +@pytest.fixture() +def action_response(action1_running): + return { + "action": action1_running, + } + + @pytest.fixture() -def generic_action(): +def action_list_response(action1_running, action2_running): return { - "action": { - "id": 1, - "command": "stop_server", - "status": "running", - "progress": 0, - "started": "2016-01-30T23:50+00:00", - "finished": None, - "resources": [{"id": 42, "type": "server"}], - "error": {"code": "action_failed", "message": "Action failed"}, - } + "actions": [ + action1_running, + action2_running, + ], } diff --git a/tests/unit/floating_ips/test_client.py b/tests/unit/floating_ips/test_client.py index 1cc5bd1f..fc90419c 100644 --- a/tests/unit/floating_ips/test_client.py +++ b/tests/unit/floating_ips/test_client.py @@ -91,9 +91,9 @@ def test_delete( self, request_mock: mock.MagicMock, bound_floating_ip, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response delete_success = bound_floating_ip.delete() @@ -108,9 +108,9 @@ def test_change_protection( self, request_mock: mock.MagicMock, bound_floating_ip, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_floating_ip.change_protection(True) @@ -131,9 +131,9 @@ def test_assign( request_mock: mock.MagicMock, bound_floating_ip, server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_floating_ip.assign(server) @@ -149,9 +149,9 @@ def test_unassign( self, request_mock: mock.MagicMock, bound_floating_ip, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_floating_ip.unassign() @@ -166,9 +166,9 @@ def test_change_dns_ptr( self, request_mock: mock.MagicMock, bound_floating_ip, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_floating_ip.change_dns_ptr("1.2.3.4", "server02.example.com") @@ -448,9 +448,9 @@ def test_change_protection( request_mock: mock.MagicMock, floating_ips_client: FloatingIPsClient, floating_ip, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = floating_ips_client.change_protection(floating_ip, True) @@ -471,9 +471,9 @@ def test_delete( request_mock: mock.MagicMock, floating_ips_client: FloatingIPsClient, floating_ip, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response delete_success = floating_ips_client.delete(floating_ip) @@ -500,9 +500,9 @@ def test_assign( floating_ips_client: FloatingIPsClient, server, floating_ip, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = floating_ips_client.assign(floating_ip, server) @@ -523,9 +523,9 @@ def test_unassign( request_mock: mock.MagicMock, floating_ips_client: FloatingIPsClient, floating_ip, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = floating_ips_client.unassign(floating_ip) @@ -545,9 +545,9 @@ def test_change_dns_ptr( request_mock: mock.MagicMock, floating_ips_client: FloatingIPsClient, floating_ip, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = floating_ips_client.change_dns_ptr( floating_ip, "1.2.3.4", "server02.example.com" diff --git a/tests/unit/images/test_client.py b/tests/unit/images/test_client.py index 384dce48..49fc76ac 100644 --- a/tests/unit/images/test_client.py +++ b/tests/unit/images/test_client.py @@ -133,9 +133,9 @@ def test_delete( self, request_mock: mock.MagicMock, bound_image, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response delete_success = bound_image.delete() @@ -150,9 +150,9 @@ def test_change_protection( self, request_mock: mock.MagicMock, bound_image, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_image.change_protection(True) @@ -398,9 +398,9 @@ def test_change_protection( request_mock: mock.MagicMock, images_client: ImagesClient, image, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = images_client.change_protection(image, True) @@ -421,9 +421,9 @@ def test_delete( request_mock: mock.MagicMock, images_client: ImagesClient, image, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response delete_success = images_client.delete(image) diff --git a/tests/unit/load_balancers/test_client.py b/tests/unit/load_balancers/test_client.py index a41a2c3b..ff60b88c 100644 --- a/tests/unit/load_balancers/test_client.py +++ b/tests/unit/load_balancers/test_client.py @@ -114,9 +114,9 @@ def test_delete( self, request_mock: mock.MagicMock, bound_load_balancer, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response delete_success = bound_load_balancer.delete() @@ -464,9 +464,9 @@ def test_change_type( self, request_mock: mock.MagicMock, bound_load_balancer, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_load_balancer.change_type(LoadBalancerType(name="lb21")) @@ -644,9 +644,9 @@ def test_change_type_with_load_balancer_type_name( request_mock: mock.MagicMock, load_balancers_client: LoadBalancersClient, load_balancer, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = load_balancers_client.change_type( load_balancer, LoadBalancerType(name="lb11") @@ -670,9 +670,9 @@ def test_change_type_with_load_balancer_type_id( request_mock: mock.MagicMock, load_balancers_client: LoadBalancersClient, load_balancer, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = load_balancers_client.change_type( load_balancer, LoadBalancerType(id=1) diff --git a/tests/unit/networks/test_client.py b/tests/unit/networks/test_client.py index da2ee792..c2985c9f 100644 --- a/tests/unit/networks/test_client.py +++ b/tests/unit/networks/test_client.py @@ -96,9 +96,9 @@ def test_delete( self, request_mock: mock.MagicMock, bound_network, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response delete_success = bound_network.delete() @@ -113,9 +113,9 @@ def test_change_protection( self, request_mock: mock.MagicMock, bound_network, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_network.change_protection(True) @@ -132,9 +132,9 @@ def test_add_subnet( self, request_mock: mock.MagicMock, bound_network, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response subnet = NetworkSubnet( type=NetworkSubnet.TYPE_CLOUD, @@ -160,9 +160,9 @@ def test_delete_subnet( self, request_mock: mock.MagicMock, bound_network, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response subnet = NetworkSubnet(ip_range="10.0.1.0/24") action = bound_network.delete_subnet(subnet) @@ -180,9 +180,9 @@ def test_add_route( self, request_mock: mock.MagicMock, bound_network, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response route = NetworkRoute(destination="10.100.1.0/24", gateway="10.0.1.1") action = bound_network.add_route(route) @@ -200,9 +200,9 @@ def test_delete_route( self, request_mock: mock.MagicMock, bound_network, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response route = NetworkRoute(destination="10.100.1.0/24", gateway="10.0.1.1") action = bound_network.delete_route(route) @@ -220,9 +220,9 @@ def test_change_ip( self, request_mock: mock.MagicMock, bound_network, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_network.change_ip_range("10.0.0.0/12") @@ -619,9 +619,9 @@ def test_change_protection( request_mock: mock.MagicMock, networks_client: NetworksClient, network, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = networks_client.change_protection(network, True) @@ -642,9 +642,9 @@ def test_delete( request_mock: mock.MagicMock, networks_client: NetworksClient, network, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response delete_success = networks_client.delete(network) @@ -663,10 +663,10 @@ def test_add_subnet( request_mock: mock.MagicMock, networks_client: NetworksClient, network, - generic_action, + action_response, network_subnet, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = networks_client.add_subnet(network, network_subnet) @@ -691,10 +691,10 @@ def test_add_subnet_vswitch( request_mock: mock.MagicMock, networks_client: NetworksClient, network, - generic_action, + action_response, network_vswitch_subnet, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = networks_client.add_subnet(network, network_vswitch_subnet) @@ -720,10 +720,10 @@ def test_delete_subnet( request_mock: mock.MagicMock, networks_client: NetworksClient, network, - generic_action, + action_response, network_subnet, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = networks_client.delete_subnet(network, network_subnet) @@ -744,10 +744,10 @@ def test_add_route( request_mock: mock.MagicMock, networks_client: NetworksClient, network, - generic_action, + action_response, network_route, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = networks_client.add_route(network, network_route) @@ -768,10 +768,10 @@ def test_delete_route( request_mock: mock.MagicMock, networks_client: NetworksClient, network, - generic_action, + action_response, network_route, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = networks_client.delete_route(network, network_route) @@ -792,9 +792,9 @@ def test_change_ip_range( request_mock: mock.MagicMock, networks_client: NetworksClient, network, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = networks_client.change_ip_range(network, "10.0.0.0/12") diff --git a/tests/unit/primary_ips/test_client.py b/tests/unit/primary_ips/test_client.py index b7b3c07c..6bec0e76 100644 --- a/tests/unit/primary_ips/test_client.py +++ b/tests/unit/primary_ips/test_client.py @@ -63,9 +63,9 @@ def test_delete( self, request_mock: mock.MagicMock, bound_primary_ip, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response delete_success = bound_primary_ip.delete() @@ -80,9 +80,9 @@ def test_change_protection( self, request_mock: mock.MagicMock, bound_primary_ip, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_primary_ip.change_protection(True) @@ -99,9 +99,9 @@ def test_assign( self, request_mock: mock.MagicMock, bound_primary_ip, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_primary_ip.assign(assignee_id=12, assignee_type="server") @@ -117,9 +117,9 @@ def test_unassign( self, request_mock: mock.MagicMock, bound_primary_ip, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_primary_ip.unassign() @@ -134,9 +134,9 @@ def test_change_dns_ptr( self, request_mock: mock.MagicMock, bound_primary_ip, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_primary_ip.change_dns_ptr("1.2.3.4", "server02.example.com") @@ -319,9 +319,9 @@ def test_change_protection( request_mock: mock.MagicMock, primary_ips_client: PrimaryIPsClient, primary_ip, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = primary_ips_client.change_protection(primary_ip, True) @@ -342,9 +342,9 @@ def test_delete( request_mock: mock.MagicMock, primary_ips_client: PrimaryIPsClient, primary_ip, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response delete_success = primary_ips_client.delete(primary_ip) @@ -369,9 +369,9 @@ def test_assign( assignee_id, assignee_type, primary_ip, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = primary_ips_client.assign(primary_ip, assignee_id, assignee_type) @@ -391,9 +391,9 @@ def test_unassign( request_mock: mock.MagicMock, primary_ips_client: PrimaryIPsClient, primary_ip, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = primary_ips_client.unassign(primary_ip) @@ -412,9 +412,9 @@ def test_change_dns_ptr( request_mock: mock.MagicMock, primary_ips_client: PrimaryIPsClient, primary_ip, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = primary_ips_client.change_dns_ptr( primary_ip, "1.2.3.4", "server02.example.com" diff --git a/tests/unit/servers/test_client.py b/tests/unit/servers/test_client.py index 7b496c51..43088dfb 100644 --- a/tests/unit/servers/test_client.py +++ b/tests/unit/servers/test_client.py @@ -213,9 +213,9 @@ def test_delete( self, request_mock: mock.MagicMock, bound_server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_server.delete() @@ -259,9 +259,9 @@ def test_power_off( self, request_mock: mock.MagicMock, bound_server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_server.power_off() @@ -277,9 +277,9 @@ def test_power_on( self, request_mock: mock.MagicMock, bound_server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_server.power_on() @@ -295,9 +295,9 @@ def test_reboot( self, request_mock: mock.MagicMock, bound_server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_server.reboot() @@ -313,9 +313,9 @@ def test_reset( self, request_mock: mock.MagicMock, bound_server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_server.reset() @@ -331,9 +331,9 @@ def test_shutdown( self, request_mock: mock.MagicMock, bound_server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_server.shutdown() @@ -368,9 +368,9 @@ def test_change_type( self, request_mock: mock.MagicMock, bound_server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_server.change_type(ServerType(name="cx11"), upgrade_disk=True) @@ -407,9 +407,9 @@ def test_disable_rescue( self, request_mock: mock.MagicMock, bound_server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_server.disable_rescue() @@ -445,9 +445,9 @@ def test_rebuild( self, request_mock: mock.MagicMock, bound_server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response response = bound_server.rebuild( Image(name="ubuntu-20.04"), @@ -468,9 +468,9 @@ def test_enable_backup( self, request_mock: mock.MagicMock, bound_server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_server.enable_backup() @@ -486,9 +486,9 @@ def test_disable_backup( self, request_mock: mock.MagicMock, bound_server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_server.disable_backup() @@ -504,9 +504,9 @@ def test_attach_iso( self, request_mock: mock.MagicMock, bound_server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_server.attach_iso(Iso(name="FreeBSD-11.0-RELEASE-amd64-dvd1")) @@ -523,9 +523,9 @@ def test_detach_iso( self, request_mock: mock.MagicMock, bound_server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_server.detach_iso() @@ -541,9 +541,9 @@ def test_change_dns_ptr( self, request_mock: mock.MagicMock, bound_server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_server.change_dns_ptr("1.2.3.4", "example.com") @@ -560,9 +560,9 @@ def test_change_protection( self, request_mock: mock.MagicMock, bound_server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_server.change_protection(True, True) @@ -1169,9 +1169,9 @@ def test_delete( request_mock: mock.MagicMock, servers_client: ServersClient, server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = servers_client.delete(server) @@ -1191,9 +1191,9 @@ def test_power_off( request_mock: mock.MagicMock, servers_client: ServersClient, server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = servers_client.power_off(server) @@ -1213,9 +1213,9 @@ def test_power_on( request_mock: mock.MagicMock, servers_client: ServersClient, server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = servers_client.power_on(server) @@ -1235,9 +1235,9 @@ def test_reboot( request_mock: mock.MagicMock, servers_client: ServersClient, server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = servers_client.reboot(server) @@ -1257,9 +1257,9 @@ def test_reset( request_mock: mock.MagicMock, servers_client: ServersClient, server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = servers_client.reset(server) @@ -1279,9 +1279,9 @@ def test_shutdown( request_mock: mock.MagicMock, servers_client: ServersClient, server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = servers_client.shutdown(server) @@ -1324,9 +1324,9 @@ def test_change_type_with_server_type_name( request_mock: mock.MagicMock, servers_client: ServersClient, server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = servers_client.change_type( server, ServerType(name="cx11"), upgrade_disk=True @@ -1349,9 +1349,9 @@ def test_change_type_with_server_type_id( request_mock: mock.MagicMock, servers_client: ServersClient, server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = servers_client.change_type(server, ServerType(id=1), upgrade_disk=True) @@ -1411,9 +1411,9 @@ def test_disable_rescue( request_mock: mock.MagicMock, servers_client: ServersClient, server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = servers_client.disable_rescue(server) @@ -1463,9 +1463,9 @@ def test_rebuild( request_mock: mock.MagicMock, servers_client: ServersClient, server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response response = servers_client.rebuild( server, @@ -1491,9 +1491,9 @@ def test_enable_backup( request_mock: mock.MagicMock, servers_client: ServersClient, server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = servers_client.enable_backup(server) @@ -1513,9 +1513,9 @@ def test_disable_backup( request_mock: mock.MagicMock, servers_client: ServersClient, server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = servers_client.disable_backup(server) @@ -1535,9 +1535,9 @@ def test_attach_iso( request_mock: mock.MagicMock, servers_client: ServersClient, server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = servers_client.attach_iso( server, Iso(name="FreeBSD-11.0-RELEASE-amd64-dvd1") @@ -1560,9 +1560,9 @@ def test_detach_iso( request_mock: mock.MagicMock, servers_client: ServersClient, server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = servers_client.detach_iso(server) @@ -1582,9 +1582,9 @@ def test_change_dns_ptr( request_mock: mock.MagicMock, servers_client: ServersClient, server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = servers_client.change_dns_ptr(server, "1.2.3.4", "example.com") @@ -1605,9 +1605,9 @@ def test_change_protection( request_mock: mock.MagicMock, servers_client: ServersClient, server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = servers_client.change_protection(server, True, True) diff --git a/tests/unit/ssh_keys/test_client.py b/tests/unit/ssh_keys/test_client.py index 24cf48f7..31e58e71 100644 --- a/tests/unit/ssh_keys/test_client.py +++ b/tests/unit/ssh_keys/test_client.py @@ -49,9 +49,9 @@ def test_delete( self, request_mock: mock.MagicMock, bound_ssh_key, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response delete_success = bound_ssh_key.delete() @@ -264,9 +264,9 @@ def test_delete( request_mock: mock.MagicMock, ssh_keys_client: SSHKeysClient, ssh_key, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response delete_success = ssh_keys_client.delete(ssh_key) diff --git a/tests/unit/volumes/test_client.py b/tests/unit/volumes/test_client.py index fc0bffa2..e01ffe46 100644 --- a/tests/unit/volumes/test_client.py +++ b/tests/unit/volumes/test_client.py @@ -88,9 +88,9 @@ def test_delete( self, request_mock: mock.MagicMock, bound_volume, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response delete_success = bound_volume.delete() @@ -105,9 +105,9 @@ def test_change_protection( self, request_mock: mock.MagicMock, bound_volume, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_volume.change_protection(True) @@ -128,9 +128,9 @@ def test_attach( request_mock: mock.MagicMock, bound_volume, server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_volume.attach(server) @@ -150,9 +150,9 @@ def test_attach_with_automount( request_mock: mock.MagicMock, bound_volume, server, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_volume.attach(server, False) @@ -168,9 +168,9 @@ def test_detach( self, request_mock: mock.MagicMock, bound_volume, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_volume.detach() @@ -185,9 +185,9 @@ def test_resize( self, request_mock: mock.MagicMock, bound_volume, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = bound_volume.resize(50) @@ -472,9 +472,9 @@ def test_change_protection( request_mock: mock.MagicMock, volumes_client: VolumesClient, volume, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = volumes_client.change_protection(volume, True) @@ -495,9 +495,9 @@ def test_delete( request_mock: mock.MagicMock, volumes_client: VolumesClient, volume, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response delete_success = volumes_client.delete(volume) @@ -524,9 +524,9 @@ def test_attach( volumes_client: VolumesClient, server, volume, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = volumes_client.attach(volume, server) @@ -546,9 +546,9 @@ def test_detach( request_mock: mock.MagicMock, volumes_client: VolumesClient, volume, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = volumes_client.detach(volume) @@ -567,9 +567,9 @@ def test_resize( request_mock: mock.MagicMock, volumes_client: VolumesClient, volume, - generic_action, + action_response, ): - request_mock.return_value = generic_action + request_mock.return_value = action_response action = volumes_client.resize(volume, 50)