summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Falcon <james.falcon@canonical.com>2022-05-17 10:05:50 -0500
committerGitHub <noreply@github.com>2022-05-17 10:05:50 -0500
commitada49b694169382ce34f502a05f82e16777755b2 (patch)
treed92c2169d429e69fa15f86287ce12c32e8ba2e90
parentfbae864190fa5790dc4958a980600c884a2778b0 (diff)
downloadcloud-init-git-ada49b694169382ce34f502a05f82e16777755b2.tar.gz
testing: make fake cloud-init wait actually wait (#1459)
-rw-r--r--tests/integration_tests/cmd/test_status.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/integration_tests/cmd/test_status.py b/tests/integration_tests/cmd/test_status.py
index 53bab5fd..ced883fd 100644
--- a/tests/integration_tests/cmd/test_status.py
+++ b/tests/integration_tests/cmd/test_status.py
@@ -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)
+ ):
return result
except Exception as e:
last_exception = e