openstack
/
cinder
Code Issues Proposed changes

Merge "Port objects unit tests to Python 3"

This commit is contained in:
Jenkins 2016-02-09 03:29:14 +00:00 committed by Gerrit Code Review
parent 4063207ddc f3dc1a0c54
commit e4aa3313bb
13 changed files with 75 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cinder/objects/backup.py
View File

@ -12,15 +12,12 @@
# License for the specific language governing permissions and limitations
# under the License.
import base64
import binascii
from oslo_config import cfg
from oslo_log import log as logging
from oslo_serialization import base64
from oslo_serialization import jsonutils
from oslo_utils import versionutils
from oslo_versionedobjects import fields
import six
from cinder import db
from cinder import exception
@ -136,8 +133,8 @@ class Backup(base.CinderPersistentObject, base.CinderObject,
:raises: InvalidInput
"""
try:
return jsonutils.loads(base64.decodestring(backup_url))
except binascii.Error:
return jsonutils.loads(base64.decode_as_text(backup_url))
except TypeError:
msg = _("Can't decode backup record.")
except ValueError:
msg = _("Can't parse backup record.")
@ -153,10 +150,8 @@ class Backup(base.CinderPersistentObject, base.CinderObject,
# We must update kwargs instead of record to ensure we don't overwrite
# "real" data from the backup
kwargs.update(record)
retval = jsonutils.dumps(kwargs)
if six.PY3:
retval = retval.encode('utf-8')
return base64.encodestring(retval)
retval = jsonutils.dump_as_bytes(kwargs)
return base64.encode_as_text(retval)
@base.CinderObjectRegistry.register

3
cinder/tests/unit/api/contrib/test_backups.py
View File

@ -23,6 +23,7 @@ from xml.dom import minidom
import ddt
import mock
from oslo_utils import timeutils
import six
import webob
# needed for stubs to work
@ -1792,6 +1793,8 @@ class BackupsAPITestCase(test.TestCase):
_mock_list_services.return_value = [backup_service]
req = webob.Request.blank('/v2/fake/backups/import_record')
if six.PY2:
backup_url = backup_url.encode('utf-8')
req.body = ('<backup-record backup_service="%(backup_service)s" '
'backup_url="%(backup_url)s"/>') \
% {'backup_url': backup_url,

8
cinder/tests/unit/objects/__init__.py
View File

@ -15,6 +15,7 @@
from oslo_utils import timeutils
from cinder import context
from cinder import exception
from cinder.objects import base as obj_base
from cinder import test
@ -36,7 +37,12 @@ class BaseObjectsTestCase(test.TestCase):
@staticmethod
def _compare(test, db, obj):
for field, value in db.items():
if not hasattr(obj, field):
try:
getattr(obj, field)
except (AttributeError, exception.CinderException,
NotImplementedError):
# NotImplementedError: ignore "Cannot load 'projects' in the
# base class" error
continue
if field in ('modified_at', 'created_at',

7
cinder/tests/unit/objects/test_backup.py
View File

@ -13,6 +13,7 @@
# under the License.
import mock
import six
from cinder.db.sqlalchemy import models
from cinder import exception
@ -164,8 +165,12 @@ class TestBackup(test_objects.BaseObjectsTestCase):
# for that field
backup.refresh()
self._compare(self, db_backup2, backup)
if six.PY3:
call_bool = mock.call.__bool__()
else:
call_bool = mock.call.__nonzero__()
backup_get.assert_has_calls([mock.call(self.context, '1'),
mock.call.__nonzero__(),
call_bool,
mock.call(self.context, '1')])

2
cinder/tests/unit/objects/test_base.py
View File

@ -173,7 +173,7 @@ class TestCinderObjectConditionalUpdate(test.TestCase):
self.assertEqual(status, volume.status)
self.assertEqual(size, volume.size)
dirty = volume.cinder_obj_get_changes()
self.assertEqual(list(dirty_keys), dirty.keys())
self.assertEqual(list(dirty_keys), list(dirty.keys()))
for key, value in kwargs.items():
self.assertEqual(value, getattr(volume, key))

7
cinder/tests/unit/objects/test_cgsnapshot.py
View File

@ -13,6 +13,7 @@
# under the License.
import mock
import six
from cinder import exception
from cinder import objects
@ -123,8 +124,12 @@ class TestCGSnapshot(test_objects.BaseObjectsTestCase):
# value for that field
cgsnapshot.refresh()
self._compare(self, db_cgsnapshot2, cgsnapshot)
if six.PY3:
call_bool = mock.call.__bool__()
else:
call_bool = mock.call.__nonzero__()
cgsnapshot_get.assert_has_calls([mock.call(self.context, '1'),
mock.call.__nonzero__(),
call_bool,
mock.call(self.context, '1')])

7
cinder/tests/unit/objects/test_consistencygroup.py
View File

@ -13,6 +13,7 @@
# under the License.
import mock
import six
from cinder import exception
from cinder import objects
@ -162,8 +163,12 @@ class TestConsistencyGroup(test_objects.BaseObjectsTestCase):
# new value for that field
cg.refresh()
self._compare(self, db_cg2, cg)
if six.PY3:
call_bool = mock.call.__bool__()
else:
call_bool = mock.call.__nonzero__()
consistencygroup_get.assert_has_calls([mock.call(self.context, '1'),
mock.call.__nonzero__(),
call_bool,
mock.call(self.context, '1')])

7
cinder/tests/unit/objects/test_service.py
View File

@ -13,6 +13,7 @@
# under the License.
import mock
import six
from cinder import objects
from cinder.tests.unit import fake_service
@ -93,8 +94,12 @@ class TestService(test_objects.BaseObjectsTestCase):
# new value for that field
service.refresh()
self._compare(self, db_service2, service)
if six.PY3:
call_bool = mock.call.__bool__()
else:
call_bool = mock.call.__nonzero__()
service_get.assert_has_calls([mock.call(self.context, 123),
mock.call.__nonzero__(),
call_bool,
mock.call(self.context, 123)])
@mock.patch('cinder.db.service_get_all_by_binary')

7
cinder/tests/unit/objects/test_snapshot.py
View File

@ -14,6 +14,7 @@
import copy
import mock
import six
from oslo_log import log as logging
@ -183,8 +184,12 @@ class TestSnapshot(test_objects.BaseObjectsTestCase):
# value for that field
snapshot.refresh()
self._compare(self, db_snapshot2, snapshot)
if six.PY3:
call_bool = mock.call.__bool__()
else:
call_bool = mock.call.__nonzero__()
snapshot_get.assert_has_calls([mock.call(self.context, '1'),
mock.call.__nonzero__(),
call_bool,
mock.call(self.context, '1')])

7
cinder/tests/unit/objects/test_volume.py
View File

@ -13,6 +13,7 @@
# under the License.
import mock
import six
from cinder import context
from cinder import exception
@ -291,8 +292,12 @@ class TestVolume(test_objects.BaseObjectsTestCase):
# for that field
volume.refresh()
self._compare(self, db_volume2, volume)
if six.PY3:
call_bool = mock.call.__bool__()
else:
call_bool = mock.call.__nonzero__()
volume_get.assert_has_calls([mock.call(self.context, '1'),
mock.call.__nonzero__(),
call_bool,
mock.call(self.context, '1')])
def test_metadata_aliases(self):

7
cinder/tests/unit/objects/test_volume_attachment.py
View File

@ -13,6 +13,7 @@
# under the License.
import mock
import six
from cinder import objects
from cinder.tests.unit import fake_volume
@ -52,8 +53,12 @@ class TestVolumeAttachment(test_objects.BaseObjectsTestCase):
# new value for that field
attachment.refresh()
self._compare(self, db_attachment2, attachment)
if six.PY3:
call_bool = mock.call.__bool__()
else:
call_bool = mock.call.__nonzero__()
attachment_get.assert_has_calls([mock.call(self.context, '1'),
mock.call.__nonzero__(),
call_bool,
mock.call(self.context, '1')])

7
cinder/tests/unit/objects/test_volume_type.py
View File

@ -13,6 +13,7 @@
# under the License.
import mock
import six
from cinder import objects
from cinder.tests.unit import fake_volume
@ -86,8 +87,12 @@ class TestVolumeType(test_objects.BaseObjectsTestCase):
# value for that field
volume_type.refresh()
self._compare(self, db_type2, volume_type)
if six.PY3:
call_bool = mock.call.__bool__()
else:
call_bool = mock.call.__nonzero__()
volume_type_get.assert_has_calls([mock.call(self.context, '1'),
mock.call.__nonzero__(),
call_bool,
mock.call(self.context, '1')])

11
tests-py3.txt
View File

@ -36,6 +36,17 @@ cinder.tests.unit.keymgr.test_key
cinder.tests.unit.keymgr.test_key_mgr
cinder.tests.unit.keymgr.test_mock_key_mgr
cinder.tests.unit.keymgr.test_not_implemented_key_mgr
cinder.tests.unit.objects.test_backup
cinder.tests.unit.objects.test_base
cinder.tests.unit.objects.test_cgsnapshot
cinder.tests.unit.objects.test_consistencygroup
cinder.tests.unit.objects.test_fields
cinder.tests.unit.objects.test_objects
cinder.tests.unit.objects.test_service
cinder.tests.unit.objects.test_snapshot
cinder.tests.unit.objects.test_volume
cinder.tests.unit.objects.test_volume_attachment
cinder.tests.unit.objects.test_volume_type
cinder.tests.unit.scheduler.test_allocated_capacity_weigher
cinder.tests.unit.scheduler.test_capacity_weigher
cinder.tests.unit.scheduler.test_chance_weigher