diff --git a/glanceclient/common/utils.py b/glanceclient/common/utils.py index 3c10e4d9..0c1d9863 100644 --- a/glanceclient/common/utils.py +++ b/glanceclient/common/utils.py @@ -494,6 +494,13 @@ class RequestIdProxy(wrapt.ObjectProxy): def wrapped(self): return self._self_wrapped + # Overriden next method to act as iterator + def next(self): + return next(self._self_wrapped) + + # In Python 3, __next__() has replaced next(). + __next__ = next + class GeneratorProxy(wrapt.ObjectProxy): def __init__(self, wrapped): diff --git a/glanceclient/tests/unit/test_progressbar.py b/glanceclient/tests/unit/test_progressbar.py index 1841cd00..76f96fb3 100644 --- a/glanceclient/tests/unit/test_progressbar.py +++ b/glanceclient/tests/unit/test_progressbar.py @@ -15,6 +15,7 @@ import sys +import requests import six import testtools @@ -27,12 +28,16 @@ class TestProgressBarWrapper(testtools.TestCase): def test_iter_iterator_display_progress_bar(self): size = 100 + # create fake response object to return request-id with iterator + resp = requests.Response() + resp.headers['x-openstack-request-id'] = 'req-1234' iterator_with_len = utils.IterableWithLength(iter('X' * 100), size) + requestid_proxy = utils.RequestIdProxy((iterator_with_len, resp)) saved_stdout = sys.stdout try: sys.stdout = output = test_utils.FakeTTYStdout() # Consume iterator. - data = list(progressbar.VerboseIteratorWrapper(iterator_with_len, + data = list(progressbar.VerboseIteratorWrapper(requestid_proxy, size)) self.assertEqual(['X'] * 100, data) self.assertEqual(