openstack/cinder
Code Issues Proposed changes

Fix imageutils tests on windows

Browse Source 
Some of the imageutils unit tests are currently failing on Windows.

Two of them make assertions on arguments that are platform dependent
while another one fails due to the fact that os.path.join cannot
be used with mock objects on Windows.

This change fixes those issues.

Change-Id: Ieda734e49bdb45566f39f201004b2a3e0b1ba1eb
This commit is contained in:
AlexMuresan 2017-10-18 14:15:48 +03:00
parent 66b3a52794
commit 3407100f94
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cinder/tests/unit/test_image_utils.py
View File

@ -31,6 +31,7 @@ from cinder.volume import throttling
class TestQemuImgInfo(test.TestCase):
@mock.patch('os.name', new='posix')
@mock.patch('oslo_utils.imageutils.QemuImgInfo')
@mock.patch('cinder.utils.execute')
def test_qemu_img_info(self, mock_exec, mock_info):
@ -45,6 +46,7 @@ class TestQemuImgInfo(test.TestCase):
prlimit=image_utils.QEMU_IMG_LIMITS)
self.assertEqual(mock_info.return_value, output)
@mock.patch('os.name', new='posix')
@mock.patch('oslo_utils.imageutils.QemuImgInfo')
@mock.patch('cinder.utils.execute')
def test_qemu_img_info_not_root(self, mock_exec, mock_info):
@ -1475,6 +1477,9 @@ class TestVhdUtils(test.TestCase):
mock.sentinel.fourth,
mock.sentinel.fifth)
# os.path.join does not work with MagicMock objects on Windows.
mock_temp.return_value.__enter__.return_value = 'fake_temp_dir'
output = image_utils.coalesce_chain(vhd_chain)
self.assertEqual(mock.sentinel.fifth, output)