From 1328000f9b9415c4fc6c0a91e68b7756d93bca5c Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Sun, 29 May 2016 06:47:09 -0700 Subject: [PATCH] RPC unit tests: remove UUID future warnings Mkae sure that objects make use of a UUID and not a fake one. Change-Id: I6c4c51e8b5d8d5a347e9ccbef40ba04286850a41 Closes-bug: #1586776 --- neutron/tests/unit/api/rpc/handlers/test_resources_rpc.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/neutron/tests/unit/api/rpc/handlers/test_resources_rpc.py b/neutron/tests/unit/api/rpc/handlers/test_resources_rpc.py index 6a3136451d5..5bbdca1a2e5 100644 --- a/neutron/tests/unit/api/rpc/handlers/test_resources_rpc.py +++ b/neutron/tests/unit/api/rpc/handlers/test_resources_rpc.py @@ -14,6 +14,7 @@ # limitations under the License. import mock +from oslo_utils import uuidutils from oslo_versionedobjects import fields as obj_fields from oslo_versionedobjects import fixture import testtools @@ -27,8 +28,8 @@ from neutron.objects import base as objects_base from neutron.tests import base -def _create_test_dict(): - return {'id': 'uuid', +def _create_test_dict(uuid=None): + return {'id': uuid or uuidutils.generate_uuid(), 'field': 'foo'} @@ -155,7 +156,7 @@ class ResourcesPullRpcCallbackTestCase(ResourcesRpcBaseTestCase): self.resource_obj = _create_test_resource(self.context) def test_pull(self): - resource_dict = _create_test_dict() + resource_dict = _create_test_dict(uuid=self.resource_obj.id) with mock.patch.object( resources_rpc.prod_registry, 'pull', return_value=self.resource_obj) as registry_mock: