openstack/ironic-python-agent
Code Issues Proposed changes

Merge "Minor clean-up follow-up to timeout on read() fix"

Browse Source
This commit is contained in:
Zuul
2020-06-25 10:23:18 +00:00
committed by Gerrit Code Review
parent 159ab9f0ce 7abda4eefe
commit c94fb84497
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ironic_python_agent/extensions/standby.py
View File

@@ -282,7 +282,6 @@ class ImageDownload(object):
any reason. any reason.
""" """
self._time = time_obj or time.time() self._time = time_obj or time.time()
self._last_chunk_time = None
self._image_info = image_info self._image_info = image_info
self._request = None self._request = None
@@ -344,6 +343,7 @@ class ImageDownload(object):
:returns: A chunk of the image. Size of chunk is IMAGE_CHUNK_SIZE :returns: A chunk of the image. Size of chunk is IMAGE_CHUNK_SIZE
which is a constant in this module. which is a constant in this module.
""" """
self._last_chunk_time = None
for chunk in self._request.iter_content(IMAGE_CHUNK_SIZE): for chunk in self._request.iter_content(IMAGE_CHUNK_SIZE):
# Per requests forum posts/discussions, iter_content should # Per requests forum posts/discussions, iter_content should
# periodically yield to the caller for the client to do things # periodically yield to the caller for the client to do things

9
ironic_python_agent/tests/unit/extensions/test_standby.py
View File

@@ -1227,7 +1227,6 @@ class TestStandbyExtension(base.IronicAgentTest):
status_code = 200 status_code = 200
def __init__(self, url, stream, proxies, verify, cert, timeout): def __init__(self, url, stream, proxies, verify, cert, timeout):
time.sleep(1)
self.count = 0 self.count = 0
def __iter__(self): def __iter__(self):
@@ -1237,12 +1236,8 @@ class TestStandbyExtension(base.IronicAgentTest):
if self.count == 1: if self.count == 1:
time.sleep(4) time.sleep(4)
return None return None
if self.count < 3: self.count += 1
self.count += 1 return "meow"
return "meow"
else:
time.sleep(30)
raise StopIteration
def iter_content(self, chunk_size): def iter_content(self, chunk_size):
return self return self