openstack/cinder
Code Issues Proposed changes

Merge "Port image_utils to Python 3"

Browse Source
This commit is contained in:
Jenkins 2015-09-25 17:02:30 +00:00 committed by Gerrit Code Review
commit a61a2dbcf6
2 changed files with 6 additions and 1 deletions

3
cinder/image/image_utils.py

@ -80,7 +80,8 @@ def _get_version_from_string(version_string):
def check_qemu_img_version(minimum_version):
qemu_version = get_qemu_img_version()
if qemu_version < _get_version_from_string(minimum_version):
if (qemu_version is None
or qemu_version < _get_version_from_string(minimum_version)):
if qemu_version:
current_version = '.'.join((str(element)
for element in qemu_version))

4
tox.ini

@ -74,7 +74,10 @@ commands =
cinder.tests.unit.test_ibm_flashsystem_iscsi \
cinder.tests.unit.test_ibmnas \
cinder.tests.unit.test_ibm_xiv_ds8k \
cinder.tests.unit.test_image_utils \
cinder.tests.unit.test_infortrend_cli \
cinder.tests.unit.test_migrations \
cinder.tests.unit.test_misc \
cinder.tests.unit.test_netapp_nfs \
cinder.tests.unit.test_nfs \
cinder.tests.unit.test_nimble \
@ -85,6 +88,7 @@ commands =
cinder.tests.unit.test_replication \
cinder.tests.unit.test_san \
cinder.tests.unit.test_scality \
cinder.tests.unit.test_service \
cinder.tests.unit.test_sheepdog \
cinder.tests.unit.test_smbfs \
cinder.tests.unit.test_solidfire \