Browse Source

Merge "Open local image files with "rb" mode" into stable/wallaby

stable/wallaby
Zuul 7 days ago
committed by Gerrit Code Review
parent
commit
e9423e9705
2 changed files with 2 additions and 1 deletions
  1. +1
    -1
      cinder/image/glance.py
  2. +1
    -0
      cinder/tests/unit/image/test_glance.py

+ 1
- 1
cinder/image/glance.py View File

@ -365,7 +365,7 @@ class GlanceImageService(object):
# a system call to cp could have significant performance
# advantages, however we do not have the path to files at
# this point in the abstraction.
with open(parsed_url.path, "r") as f:
with open(parsed_url.path, "rb") as f:
shutil.copyfileobj(f, data)
return


+ 1
- 0
cinder/tests/unit/image/test_glance.py View File

@ -830,6 +830,7 @@ class TestGlanceImageService(test.TestCase):
self.flags(allowed_direct_url_schemes=['file'])
self.service.download(self.context, image_id, writer)
mock_copyfileobj.assert_called_once_with(mock.ANY, writer)
mock_open.assert_called_once_with('/tmp/test', 'rb')
@mock.patch('six.moves.builtins.open')
@mock.patch('shutil.copyfileobj')


Loading…
Cancel
Save