diff options
| author | srushti <srushti.gadadare@nttdata.com> | 2016-03-30 05:40:26 +0000 |
|---|---|---|
| committer | Srushti Gadadare <srushti.gadadare@nttdata.com> | 2016-04-25 10:45:08 +0000 |
| commit | 60aa0a18c69a2b004477689b519b780bdb81f2fb (patch) | |
| tree | 5f9466b1f725b072acd8096016d50e8fcf6e39c9 /nova/tests/unit/image | |
| parent | 433edb6cf6dc302655a6fca4425d695ba7655911 (diff) | |
| download | nova-60aa0a18c69a2b004477689b519b780bdb81f2fb.tar.gz | |
Fix invalid uuid warnings
Currently, unit testcases of conductor, image and network
emit FutureWarnings from oslo.versionedobjects about invalid
uuids as documented here[1].
This commit changes these tests to use valid uuids so
that when they are run these warnings are no longer emitted.
Fake constants are defined for project_id and user_id as they
are used without '-' at keystone side
[1] http://docs.openstack.org/developer/oslo.versionedobjects/api/fields.html#oslo_versionedobjects.fields.UUIDField
Partial-Bug: #1557378
Change-Id: I93cd3782e5b40e381d15bacbe8720a8c4a3bef45
Diffstat (limited to 'nova/tests/unit/image')
| -rw-r--r-- | nova/tests/unit/image/test_glance.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/nova/tests/unit/image/test_glance.py b/nova/tests/unit/image/test_glance.py index 58d8bb6056..85c794f4c0 100644 --- a/nova/tests/unit/image/test_glance.py +++ b/nova/tests/unit/image/test_glance.py @@ -29,6 +29,7 @@ from nova import context from nova import exception from nova.image import glance from nova import test +from nova.tests import uuidsentinel as uuids CONF = nova.conf.CONF NOW_GLANCE_FORMAT = "2010-10-11T10:30:22.000000" @@ -724,7 +725,7 @@ class TestDownloadSignatureVerification(test.NoDBTestCase): 'properties': { 'img_signature': 'signature', 'img_signature_hash_method': 'SHA-224', - 'img_signature_certificate_uuid': 'uuid', + 'img_signature_certificate_uuid': uuids.img_sig_cert_uuid, 'img_signature_key_type': 'RSA-PSS', } } @@ -745,7 +746,9 @@ class TestDownloadSignatureVerification(test.NoDBTestCase): res = self.service.download(context=None, image_id=None, data=None, dst_path=None) self.assertEqual(self.fake_img_data, res) - mock_get_verifier.assert_called_once_with(None, 'uuid', 'SHA-224', + mock_get_verifier.assert_called_once_with(None, + uuids.img_sig_cert_uuid, + 'SHA-224', 'signature', 'RSA-PSS') mock_log.info.assert_called_once_with(mock.ANY, mock.ANY) @@ -765,7 +768,9 @@ class TestDownloadSignatureVerification(test.NoDBTestCase): mock_open.return_value = mock_dest self.service.download(context=None, image_id=None, data=None, dst_path=fake_path) - mock_get_verifier.assert_called_once_with(None, 'uuid', 'SHA-224', + mock_get_verifier.assert_called_once_with(None, + uuids.img_sig_cert_uuid, + 'SHA-224', 'signature', 'RSA-PSS') mock_log.info.assert_called_once_with(mock.ANY, mock.ANY) self.assertEqual(len(self.fake_img_data), mock_dest.write.call_count) |