openstack/python-glanceclient
Code Issues Proposed changes

Merge "Compare against 'RequestIdProxy.wrapped'"

Browse Source
This commit is contained in:
Zuul
2018-01-02 22:51:25 +00:00
committed by Gerrit Code Review
parent 11ac1e2eb3 4dcbc30e31
commit cf62e1635d
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
glanceclient/tests/unit/v2/test_shell_v2.py
View File

@@ -581,11 +581,10 @@ class ShellV2Test(testtools.TestCase):
args = self._make_args( args = self._make_args(
{'id': 'IMG-01', 'file': 'test', 'progress': True}) {'id': 'IMG-01', 'file': 'test', 'progress': True})
with mock.patch.object(self.gc.images, 'data') as mocked_data: with mock.patch.object(self.gc.images, 'data') as mocked_data, \
def _data(): mock.patch.object(utils, '_extract_request_id'):
for c in 'abcedf': mocked_data.return_value = utils.RequestIdProxy(
yield c [c for c in 'abcdef'])
mocked_data.return_value = utils.IterableWithLength(_data(), 5)
test_shell.do_image_download(self.gc, args) test_shell.do_image_download(self.gc, args)
mocked_data.assert_called_once_with('IMG-01') mocked_data.assert_called_once_with('IMG-01')

2
glanceclient/v2/shell.py
View File

@@ -353,7 +353,7 @@ def do_image_download(gc, args):
msg = "Unable to download image '%s'. (%s)" % (args.id, e) msg = "Unable to download image '%s'. (%s)" % (args.id, e)
utils.exit(msg) utils.exit(msg)
if body is None: if body.wrapped is None:
msg = ('Image %s has no data.' % args.id) msg = ('Image %s has no data.' % args.id)
utils.exit(msg) utils.exit(msg)