diff options
| author | Zuul <zuul@review.openstack.org> | 2018-01-02 22:51:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-01-02 22:51:25 +0000 |
| commit | cf62e1635d6ca6b025829e8bbf6294cb8a1fd982 (patch) | |
| tree | ae33bb4946796546a37f5e75016f1579c865585d | |
| parent | 11ac1e2eb32c4965fa4fe8d7023f006432c3917b (diff) | |
| parent | 4dcbc30e317a25495bebc073bb9913d9fd9d43a2 (diff) | |
| download | python-glanceclient-cf62e1635d6ca6b025829e8bbf6294cb8a1fd982.tar.gz | |
Merge "Compare against 'RequestIdProxy.wrapped'"2.9.0
| -rw-r--r-- | glanceclient/tests/unit/v2/test_shell_v2.py | 9 | ||||
| -rw-r--r-- | glanceclient/v2/shell.py | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/glanceclient/tests/unit/v2/test_shell_v2.py b/glanceclient/tests/unit/v2/test_shell_v2.py index 4ac8c17..d75613f 100644 --- a/glanceclient/tests/unit/v2/test_shell_v2.py +++ b/glanceclient/tests/unit/v2/test_shell_v2.py @@ -581,11 +581,10 @@ class ShellV2Test(testtools.TestCase): args = self._make_args( {'id': 'IMG-01', 'file': 'test', 'progress': True}) - with mock.patch.object(self.gc.images, 'data') as mocked_data: - def _data(): - for c in 'abcedf': - yield c - mocked_data.return_value = utils.IterableWithLength(_data(), 5) + with mock.patch.object(self.gc.images, 'data') as mocked_data, \ + mock.patch.object(utils, '_extract_request_id'): + mocked_data.return_value = utils.RequestIdProxy( + [c for c in 'abcdef']) test_shell.do_image_download(self.gc, args) mocked_data.assert_called_once_with('IMG-01') diff --git a/glanceclient/v2/shell.py b/glanceclient/v2/shell.py index 131e826..c9f1fe1 100644 --- a/glanceclient/v2/shell.py +++ b/glanceclient/v2/shell.py @@ -353,7 +353,7 @@ def do_image_download(gc, args): msg = "Unable to download image '%s'. (%s)" % (args.id, e) utils.exit(msg) - if body is None: + if body.wrapped is None: msg = ('Image %s has no data.' % args.id) utils.exit(msg) |