Skip to content

Commit

Permalink
test: make verify_clean_boot respect return code by series (#5695)
Browse files Browse the repository at this point in the history
Include a workaround for GH Actions CI.
Also update stdout / stderr output format.
  • Loading branch information
holmanb authored Sep 13, 2024
1 parent 7a32eff commit a9c6b14
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
17 changes: 13 additions & 4 deletions tests/integration_tests/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

from cloudinit.subp import subp
from tests.integration_tests.integration_settings import PLATFORM
from tests.integration_tests.releases import CURRENT_RELEASE, NOBLE

LOG = logging.getLogger("integration_testing.util")

Expand Down Expand Up @@ -347,15 +348,23 @@ def _verify_clean_boot(
out = instance.execute("cloud-init status --long")
assert 1 != out.return_code, (
f"Unexpected return code from `cloud-init status`. Expected rc=0 "
f"or rc=2, received rc={out.return_code}\nstdout: "
f"{out.stdout}\nstderr: {out.stderr}"
f"or rc=2, received rc={out.return_code}\nstdout:\n"
f"{out.stdout}\nstderr:\n{out.stderr}"
)
else:
# we know that we should have a return code of 2
out = instance.execute("cloud-init status --long")
assert 2 == out.return_code, (
rc = 2
if CURRENT_RELEASE < NOBLE and "main" != os.environ.get(
"GITHUB_BASE_REF"
):
# Old releases return 0 for backwards compatibility
rc = 0
assert rc == out.return_code, (
# CI on main doen't patch out this behavior so despite running on
# old releases it behaves as tip of main does
f"Unexpected return code from `cloud-init status`. "
f"Expected rc=2, received rc={out.return_code}\nstdout: "
f"Expected rc={rc}, received rc={out.return_code}\nstdout: "
f"{out.stdout}\nstderr: {out.stderr}"
)
schema = instance.execute("cloud-init schema --system --annotate")
Expand Down
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ passenv =
CLOUD_INIT_*
SSH_AUTH_SOCK
OS_*
GITHUB_*
setenv =
PYTEST_ADDOPTS="-m ci and not adhoc"

Expand Down

0 comments on commit a9c6b14

Please sign in to comment.