From 5bb3cb0e27bd13edc0544325e9b9addf3735687b Mon Sep 17 00:00:00 2001 From: Brian Curtin Date: Thu, 9 Jul 2015 11:36:48 -0500 Subject: [PATCH] Argument consistency in test_proxy_base This change brings a few more test methods to consistency in ordering of arguments and the use of the default mock_method argument. Note: this doesn't touch verify_find yet because the implementations don't use BaseProxy, yet. Change-Id: I27d3e8d43a5406b24e9b82fa3c59c60ad8e6c3f0 --- openstack/tests/unit/compute/v2/test_proxy.py | 1 - .../tests/unit/object_store/v1/test_proxy.py | 8 +++---- .../tests/unit/orchestration/v1/test_proxy.py | 1 - openstack/tests/unit/test_proxy_base.py | 23 +++++++++++-------- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/openstack/tests/unit/compute/v2/test_proxy.py b/openstack/tests/unit/compute/v2/test_proxy.py index 364d3af6..5e3ac23a 100644 --- a/openstack/tests/unit/compute/v2/test_proxy.py +++ b/openstack/tests/unit/compute/v2/test_proxy.py @@ -192,7 +192,6 @@ class TestComputeProxy(test_proxy_base.TestProxyBase): def test_server_wait_for(self): value = server.Server(attrs={'id': '1234'}) self.verify_wait_for_status( - 'openstack.resource.wait_for_status', self.proxy.wait_for_server, method_args=[value], expected_args=[value, 'ACTIVE', ['ERROR'], 2, 120]) diff --git a/openstack/tests/unit/object_store/v1/test_proxy.py b/openstack/tests/unit/object_store/v1/test_proxy.py index 1333b9bc..7ba82988 100644 --- a/openstack/tests/unit/object_store/v1/test_proxy.py +++ b/openstack/tests/unit/object_store/v1/test_proxy.py @@ -30,11 +30,11 @@ class TestObjectStoreProxy(test_proxy_base.TestProxyBase): self.proxy = _proxy.Proxy(self.session) def test_account_metadata_get(self): - self.verify_head(container.Container, self.proxy.get_account_metadata) + self.verify_head(self.proxy.get_account_metadata, container.Container) def test_container_metadata_get(self): - self.verify_head(container.Container, - self.proxy.get_container_metadata, value="container") + self.verify_head(self.proxy.get_container_metadata, + container.Container, value="container") def test_container_delete(self): self.verify_delete(self.proxy.delete_container, @@ -48,7 +48,7 @@ class TestObjectStoreProxy(test_proxy_base.TestProxyBase): self.verify_create(self.proxy.create_container, container.Container) def test_object_metadata_get(self): - self.verify_head(obj.Object, self.proxy.get_object_metadata, + self.verify_head(self.proxy.get_object_metadata, obj.Object, value="object", container="container") def _test_object_delete(self, ignore): diff --git a/openstack/tests/unit/orchestration/v1/test_proxy.py b/openstack/tests/unit/orchestration/v1/test_proxy.py index 24eb790e..4258d975 100644 --- a/openstack/tests/unit/orchestration/v1/test_proxy.py +++ b/openstack/tests/unit/orchestration/v1/test_proxy.py @@ -47,7 +47,6 @@ class TestOrchestrationProxy(test_proxy_base.TestProxyBase): def test_stack_wait_for(self): value = stack.Stack(attrs={'id': '1234'}) self.verify_wait_for_status( - 'openstack.resource.wait_for_status', self.proxy.wait_for_stack, method_args=[value], expected_args=[value, 'CREATE_COMPLETE', ['CREATE_FAILED'], diff --git a/openstack/tests/unit/test_proxy_base.py b/openstack/tests/unit/test_proxy_base.py index 325aea0a..2d14d28f 100644 --- a/openstack/tests/unit/test_proxy_base.py +++ b/openstack/tests/unit/test_proxy_base.py @@ -100,24 +100,25 @@ class TestProxyBase(base.TestCase): expected_args=[resource_type, "resource_or_id"], expected_kwargs=expected_kwargs) - def verify_get(self, test_method, resource_type, value=None, **kwargs): + def verify_get(self, test_method, resource_type, value=None, + mock_method="openstack.proxy.BaseProxy._get", **kwargs): the_value = value if value is not None else ["value"] expected_kwargs = {"path_args": kwargs} if kwargs else {} - self._verify2("openstack.proxy.BaseProxy._get", - test_method, + self._verify2(mock_method, test_method, method_args=the_value, method_kwargs=kwargs, expected_args=[resource_type] + the_value, expected_kwargs=expected_kwargs) - def verify_head(self, resource, method, value=None, **kwargs): + def verify_head(self, test_method, resource_type, + mock_method="openstack.proxy.BaseProxy._head", + value=None, **kwargs): the_value = [value] if value is not None else [] expected_kwargs = {"path_args": kwargs} if kwargs else {} - self._verify2("openstack.proxy.BaseProxy._head", - method, + self._verify2(mock_method, test_method, method_args=the_value, method_kwargs=kwargs, - expected_args=[resource] + the_value, + expected_args=[resource_type] + the_value, expected_kwargs=expected_kwargs) def verify_find(self, mock_method, test_method, **kwargs): @@ -138,11 +139,11 @@ class TestProxyBase(base.TestCase): **kwargs) def verify_list(self, test_method, resource_type, paginated=False, + mock_method="openstack.proxy.BaseProxy._list", **kwargs): expected_kwargs = kwargs.pop("expected_kwargs", {}) expected_kwargs.update({"paginated": paginated}) - self._verify2("openstack.proxy.BaseProxy._list", - test_method, + self._verify2(mock_method, test_method, expected_args=[resource_type], expected_kwargs=expected_kwargs, expected_result=["result"], @@ -165,5 +166,7 @@ class TestProxyBase(base.TestCase): expected_kwargs=expected_kwargs, **kwargs) - def verify_wait_for_status(self, mock_method, test_method, **kwargs): + def verify_wait_for_status( + self, test_method, + mock_method="openstack.resource.wait_for_status", **kwargs): self._verify(mock_method, test_method, **kwargs)