openstack/openstacksdk
Code Issues Proposed changes

Merge "tests: Handle overridden 'verify_delete' (kw)args"

Browse Source
This commit is contained in:
Zuul 2021-12-20 19:44:59 +00:00 committed by Gerrit Code Review
commit 5838426848
2 changed files with 8 additions and 5 deletions
openstack/tests/unit
compute/v2
test_proxy.py
test_proxy_base.py

1
openstack/tests/unit/compute/v2/test_proxy.py

@ -588,7 +588,6 @@ class TestCompute(TestComputeProxy):
self.verify_delete(self.proxy.delete_server_interface, self.verify_delete(self.proxy.delete_server_interface,
server_interface.ServerInterface, True, server_interface.ServerInterface, True,
method_kwargs={"server": "test_id"}, method_kwargs={"server": "test_id"},
expected_args=[],
expected_kwargs={"server_id": "test_id"}) expected_kwargs={"server_id": "test_id"})
def test_server_interface_get(self): def test_server_interface_get(self):

12
openstack/tests/unit/test_proxy_base.py

@ -108,11 +108,15 @@ class TestProxyBase(base.TestCase):
expected_args=None, expected_kwargs=None, expected_args=None, expected_kwargs=None,
mock_method="openstack.proxy.Proxy._delete", mock_method="openstack.proxy.Proxy._delete",
): ):
method_args = method_args or ['resource_id'] if method_args is None:
method_kwargs = method_kwargs or {} method_args = ['resource_id']
if method_kwargs is None:
method_kwargs = {}
method_kwargs["ignore_missing"] = ignore_missing method_kwargs["ignore_missing"] = ignore_missing
expected_args = expected_args or method_args.copy() if expected_args is None:
expected_kwargs = expected_kwargs or method_kwargs.copy() expected_args = method_args.copy()
if expected_kwargs is None:
expected_kwargs = method_kwargs.copy()
self._verify( self._verify(
mock_method, mock_method,