openstack/cinder
Code Issues Proposed changes

Merge "Avoid using 'truncate' on Windows"

Browse Source
This commit is contained in:
Zuul 2019-01-16 18:45:16 +00:00 committed by Gerrit Code Review
commit 64f1f62910
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cinder/tests/unit/volume/drivers/test_remotefs.py
View File

@ -711,15 +711,19 @@ class RemoteFsSnapDriverTestCase(test.TestCase):
mock_local_vol_dir.assert_called_once_with(self._fake_volume)
mock_qemu_img_info.assert_called_once_with(self._fake_snapshot_path)
@ddt.data(False, True)
@ddt.data({},
{'info_file_exists': True},
{'os_name': 'nt'})
@ddt.unpack
@mock.patch('json.dump')
@mock.patch('cinder.volume.drivers.remotefs.open')
@mock.patch('os.path.exists')
def test_write_info_file(self,
info_file_exists,
mock_os_path_exists,
mock_open,
mock_json_dump):
mock_json_dump,
info_file_exists=False,
os_name='posix'):
mock_os_path_exists.return_value = info_file_exists
fake_info_path = '/path/to/info'
@ -733,7 +737,7 @@ class RemoteFsSnapDriverTestCase(test.TestCase):
mock_json_dump.assert_called_once_with(
fake_snapshot_info, mock.ANY, indent=1, sort_keys=True)
if info_file_exists:
if info_file_exists or os.name == 'nt':
self._driver._execute.assert_not_called()
self._driver._set_rw_permissions.assert_not_called()
else:

4
cinder/volume/drivers/remotefs.py
View File

@ -750,7 +750,9 @@ class RemoteFSSnapDriverBase(RemoteFSDriver):
msg = _("'active' must be present when writing snap_info.")
raise exception.RemoteFSException(msg)
if not os.path.exists(info_path):
if not (os.path.exists(info_path) or os.name == 'nt'):
# We're not managing file permissions on Windows.
# Plus, 'truncate' is not available.
self._execute('truncate', "-s0", info_path,
run_as_root=self._execute_as_root)
self._set_rw_permissions(info_path)