From 7abda4eefe2b3aa5045987933de93fe8e05739e4 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Wed, 24 Jun 2020 10:02:28 -0700 Subject: [PATCH] Minor clean-up follow-up to timeout on read() fix Just some minor cleanup driven from the review process. Change-Id: I0b3d73c251d6da6d85e11279990dcc36751e27e7 --- ironic_python_agent/extensions/standby.py | 2 +- .../tests/unit/extensions/test_standby.py | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ironic_python_agent/extensions/standby.py b/ironic_python_agent/extensions/standby.py index 0a4083907..daba9607c 100644 --- a/ironic_python_agent/extensions/standby.py +++ b/ironic_python_agent/extensions/standby.py @@ -282,7 +282,6 @@ class ImageDownload(object): any reason. """ self._time = time_obj or time.time() - self._last_chunk_time = None self._image_info = image_info self._request = None @@ -344,6 +343,7 @@ class ImageDownload(object): :returns: A chunk of the image. Size of chunk is IMAGE_CHUNK_SIZE which is a constant in this module. """ + self._last_chunk_time = None for chunk in self._request.iter_content(IMAGE_CHUNK_SIZE): # Per requests forum posts/discussions, iter_content should # periodically yield to the caller for the client to do things diff --git a/ironic_python_agent/tests/unit/extensions/test_standby.py b/ironic_python_agent/tests/unit/extensions/test_standby.py index 5f88ffa8d..0d8c8ffa3 100644 --- a/ironic_python_agent/tests/unit/extensions/test_standby.py +++ b/ironic_python_agent/tests/unit/extensions/test_standby.py @@ -1217,7 +1217,6 @@ class TestStandbyExtension(base.IronicAgentTest): status_code = 200 def __init__(self, url, stream, proxies, verify, cert, timeout): - time.sleep(1) self.count = 0 def __iter__(self): @@ -1227,12 +1226,8 @@ class TestStandbyExtension(base.IronicAgentTest): if self.count == 1: time.sleep(4) return None - if self.count < 3: - self.count += 1 - return "meow" - else: - time.sleep(30) - raise StopIteration + self.count += 1 + return "meow" def iter_content(self, chunk_size): return self