Fix wait for url #5024
Merged
Fix wait for url #5024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 tasks
blackboxsw
reviewed
Mar 7, 2024
| @@ -476,8 +477,10 @@ def test_metadata_ipv4_404(self, dhcpv4, ds_detect): | |||
| self.assertIsNone(self.datasource.get_userdata_raw()) | |||
| self.assertIsNone(self.datasource.get_vendordata_raw()) | |||
|
|
|||
| @mock.patch("cloudinit.url_helper.time.sleep", lambda x: None) | |||
| @mock.patch("cloudinit.url_helper.time.time", side_effect=count()) | |||
There was a problem hiding this comment.
Do we need the time mock, the sleep mock looks like it'll suffice.
blackboxsw
reviewed
Mar 8, 2024
cloudinit/url_helper.py
Outdated
| sleep_time: Amount of time to sleep between retries. If this and | ||
| sleep_time_cb are None, the default sleep time | ||
| defaults to 1 second and increases by 1 seconds every 5 | ||
| tries. |
There was a problem hiding this comment.
nit: Let's document mutual exclusion with sleep_time_cb here too.
blackboxsw
reviewed
Mar 8, 2024
cloudinit/url_helper.py
Outdated
|
|
||
| def timeup(max_wait, start_time): | ||
| def timeup(max_wait: float, start_time: float, sleep_time: float = 0): | ||
| """Check if time is up based on start time and max wait""" | ||
| if max_wait is None: |
There was a problem hiding this comment.
Do we also want to check if max_wait in (None, float("inf")) here to avoid extra calculations below?
blackboxsw
reviewed
Mar 8, 2024
In test_scaleway.py, test_metadata_connection_errors_legacy_ipv4_url assumes that a call to wait_for_url() will retry the number of retries specified by the datasource, but that retry number is used for readurl() calls, not wait_for_url() calls. The fact that the assertion happened to work previously was entirely incidental. Additionally, mock time.time() and time.sleep() calls so that we're not needlessly waiting in unit tests.
TheRealFalcon
force-pushed
the
fix-wait-for-url
branch
from
4ace169
to
ca82a38
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed Commit Message
Merge type