diff options
author | Julia Kreger <juliaashleykreger@gmail.com> | 2018-02-16 14:51:09 -0800 |
---|---|---|
committer | Julia Kreger <juliaashleykreger@gmail.com> | 2018-02-16 14:51:09 -0800 |
commit | 8af9e0b98d507ed3bd18f985ef057712aa4cd987 (patch) | |
tree | f0d2b12e21ec720b84c04dd1359c0f864272603b /ironic/tests/unit/objects/test_objects.py | |
parent | 1f69048b31cafb4d53a5f21ac430ac05ccd3e1b0 (diff) | |
download | ironic-8af9e0b98d507ed3bd18f985ef057712aa4cd987.tar.gz |
Fix default object versioning for Rocky
Removing default tagging since we don't carry the
mapping information for pike any longer.
Change-Id: If0775462f10a60fe1cef84734a07fe30541cf3a1
Diffstat (limited to 'ironic/tests/unit/objects/test_objects.py')
-rw-r--r-- | ironic/tests/unit/objects/test_objects.py | 59 |
1 files changed, 2 insertions, 57 deletions
diff --git a/ironic/tests/unit/objects/test_objects.py b/ironic/tests/unit/objects/test_objects.py index 4da76c7ea..eb837720f 100644 --- a/ironic/tests/unit/objects/test_objects.py +++ b/ironic/tests/unit/objects/test_objects.py @@ -506,66 +506,11 @@ class _TestObject(object): def test__from_db_object_old(self): self._test__from_db_object('1.4') - @mock.patch('ironic.common.release_mappings.RELEASE_MAPPING', - autospec=True) - def test__from_db_object_no_version(self, mock_release_mapping): - # DB doesn't have version; get it from mapping - mock_release_mapping.__getitem__.return_value = { - 'objects': { - 'MyObj': ['1.4'], - } - } - obj = MyObj(self.context) - dbobj = {'created_at': timeutils.utcnow(), - 'updated_at': timeutils.utcnow(), - 'version': None, - 'foo': 123, 'bar': 'test', 'missing': ''} - MyObj._from_db_object(self.context, obj, dbobj) - self.assertEqual(obj.__class__.VERSION, obj.VERSION) - self.assertEqual(123, obj.foo) - self.assertEqual('test', obj.bar) - self.assertEqual('foo', obj.missing) - - @mock.patch('ironic.common.release_mappings.RELEASE_MAPPING', - autospec=True) - def test__from_db_object_no_version_subset_of_fields(self, - mock_release_mapping): - # DB doesn't have version; get it from mapping - mock_release_mapping.__getitem__.return_value = { - 'objects': { - 'MyObj': ['1.5'], - } - } - obj = MyObj(self.context) - dbobj = {'created_at': timeutils.utcnow(), - 'updated_at': timeutils.utcnow(), - 'version': None, - 'foo': 123, 'bar': 'test', 'missing': '', - 'nested_object': 'test'} - # Mock obj_load_attr as this is what is called if an attribute that we - # try to access is not yet set. For all ironic objects it's a noop, - # we've implemented it in MyObj purely for testing - with mock.patch.object(obj, 'obj_load_attr', autospec=True): - MyObj._from_db_object(self.context, obj, dbobj, - fields=['foo', 'bar']) - self.assertEqual(obj.__class__.VERSION, obj.VERSION) - self.assertEqual(123, obj.foo) - self.assertEqual('test', obj.bar) - self.assertRaises(AttributeError, getattr, obj, 'missing') - self.assertEqual('testtest', obj.nested_object) - - @mock.patch('ironic.common.release_mappings.RELEASE_MAPPING', - autospec=True) - def test__from_db_object_map_version_bad(self, mock_release_mapping): - mock_release_mapping.__getitem__.return_value = { - 'objects': { - 'MyObj': ['1.6'], - } - } + def test__from_db_object_map_version_bad(self): obj = MyObj(self.context) dbobj = {'created_at': timeutils.utcnow(), 'updated_at': timeutils.utcnow(), - 'version': None, + 'version': '1.99', 'foo': 123, 'bar': 'test', 'missing': ''} self.assertRaises(object_exception.IncompatibleObjectVersion, MyObj._from_db_object, self.context, obj, dbobj) |