diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-05-30 09:52:02 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-05-30 09:52:02 +0000 |
commit | 4e39d3e0700dfa92dcb51c7e210f0742e4a2b5b0 (patch) | |
tree | 363cdc7bf8400baa62ab87fa176b43e0b6f42f4c /neutron/tests | |
parent | bd78e9cd369506094664aaf4c00cbc2c497057cd (diff) | |
parent | 1328000f9b9415c4fc6c0a91e68b7756d93bca5c (diff) | |
download | neutron-4e39d3e0700dfa92dcb51c7e210f0742e4a2b5b0.tar.gz |
Merge "RPC unit tests: remove UUID future warnings"
Diffstat (limited to 'neutron/tests')
-rw-r--r-- | neutron/tests/unit/api/rpc/handlers/test_resources_rpc.py | 7 |
1 files 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 6a3136451d..5bbdca1a2e 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: |