openstack
/
cinder
Code Issues Proposed changes

Merge "Port Windows drivers to Python 3"

This commit is contained in:
Jenkins 2015-12-02 23:11:36 +00:00 committed by Gerrit Code Review
parent 5e396ceba0 e672a49953
commit ca0bd0a5f5
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cinder/tests/unit/windows/test_windows_utils.py
View File

@ -29,6 +29,15 @@ class WindowsUtilsTestCase(test.TestCase):
self.wutils._conn_wmi = mock.Mock()
self.wutils._conn_cimv2 = mock.MagicMock()
@mock.patch.object(windows_utils.WindowsUtils, 'get_windows_version')
def test_check_min_windows_version(self, mock_get_win_version):
required_win_version = [6, 4]
actual_win_version = '6.3.0'
mock_get_win_version.return_value = actual_win_version
self.assertFalse(self.wutils.check_min_windows_version(
*required_win_version))
def _test_copy_vhd_disk(self, source_exists=True, copy_failed=False):
fake_data_file_object = mock.MagicMock()
fake_data_file_object.Copy.return_value = [int(copy_failed)]

2
cinder/volume/drivers/windows/windows_utils.py
View File

@ -423,7 +423,7 @@ class WindowsUtils(object):
def check_min_windows_version(self, major, minor, build=0):
version_str = self.get_windows_version()
return map(int, version_str.split('.')) >= [major, minor, build]
return list(map(int, version_str.split('.'))) >= [major, minor, build]
def get_windows_version(self):
return self._conn_cimv2.Win32_OperatingSystem()[0].Version