openstack/cinder
Code Issues Proposed changes

Merge "Refactor of getting qemu-img version"

Browse Source
This commit is contained in:
Jenkins
2017-02-14 19:31:55 +00:00
committed by Gerrit Code Review
parent 3c2819fd8a 7da5fe7ac1
commit e7efdb6bcb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cinder/image/image_utils.py
+1 -1
View File
@@ -84,7 +84,7 @@ def qemu_img_info(path, run_as_root=True):
def get_qemu_img_version():
info = utils.execute('qemu-img', '--help', check_exit_code=False)[0]
info = utils.execute('qemu-img', '--version', check_exit_code=False)[0]
pattern = r"qemu-img version ([0-9\.]*)"
version = re.match(pattern, info)
if not version:
cinder/tests/unit/test_image_utils.py
+1 -1
View File
@@ -84,7 +84,7 @@ class TestQemuImgInfo(test.TestCase):
expected_version = [2, 0, 0]
version = image_utils.get_qemu_img_version()
mock_exec.assert_called_once_with('qemu-img', '--help',
mock_exec.assert_called_once_with('qemu-img', '--version',
check_exit_code=False)
self.assertEqual(expected_version, version)