Merge "tests: Handle overridden 'verify_delete' (kw)args"
This commit is contained in:
commit
5838426848
@ -588,7 +588,6 @@ class TestCompute(TestComputeProxy):
|
||||
self.verify_delete(self.proxy.delete_server_interface,
|
||||
server_interface.ServerInterface, True,
|
||||
method_kwargs={"server": "test_id"},
|
||||
expected_args=[],
|
||||
expected_kwargs={"server_id": "test_id"})
|
||||
|
||||
def test_server_interface_get(self):
|
||||
|
@ -108,11 +108,15 @@ class TestProxyBase(base.TestCase):
|
||||
expected_args=None, expected_kwargs=None,
|
||||
mock_method="openstack.proxy.Proxy._delete",
|
||||
):
|
||||
method_args = method_args or ['resource_id']
|
||||
method_kwargs = method_kwargs or {}
|
||||
if method_args is None:
|
||||
method_args = ['resource_id']
|
||||
if method_kwargs is None:
|
||||
method_kwargs = {}
|
||||
method_kwargs["ignore_missing"] = ignore_missing
|
||||
expected_args = expected_args or method_args.copy()
|
||||
expected_kwargs = expected_kwargs or method_kwargs.copy()
|
||||
if expected_args is None:
|
||||
expected_args = method_args.copy()
|
||||
if expected_kwargs is None:
|
||||
expected_kwargs = method_kwargs.copy()
|
||||
|
||||
self._verify(
|
||||
mock_method,
|
||||
|
Loading…
x
Reference in New Issue
Block a user