Skip to content

testing: make fake cloud-init wait actually wait #1459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheRealFalcon merged 2 commits into from
May 17, 2022
+6 −2
Merged

testing: make fake cloud-init wait actually wait #1459

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2886e81
testing: make fake cloud-init wait actually wait
TheRealFalcon May 17, 2022
c99687e
comments
TheRealFalcon May 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions tests/integration_tests/cmd/test_status.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,12 @@ def _wait_for_cloud_init(client: IntegrationInstance):
last_exception = None
for _ in range(30):
try:
result = client.execute("cloud-init status --long")
if result and result.ok:
result = client.execute("cloud-init status")
if (
result
and result.ok
and ("running" not in result or "not run" not in result)
Copy link
Copy Markdown
Member

@holmanb holmanb May 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason we need --long here?

I don't think we are checking the extra output so to avoid future false positives ("running" or "not run" in the extra details) think we should drop it?

):
return result
except Exception as e:
last_exception = e
Expand Down