Skip to content
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

Jump to bottom

remove newline injected for cloud-init status --wait #5700

Merged
merged 4 commits into from
Sep 23, 2024
Merged

remove newline injected for cloud-init status --wait #5700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
436fd3f
Update status.py
nelsonad-ops Sep 12, 2024
1ed9b2b
update status.py and test_status.py
nelsonad-ops Sep 12, 2024
2c7ffbf
update github-cla-signers
nelsonad-ops Sep 12, 2024
19a69f5
Update status.py prefix
nelsonad-ops Sep 19, 2024
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
2 changes: 1 addition & 1 deletion cloudinit/cmd/status.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ def print_status(args, details: StatusDetails):
**details.v1,
}
if args.format == "tabular":
prefix = "\n" if args.wait else ""
prefix = ""

# For backwards compatibility, don't report degraded status here,
# extended_status key reports the complete status (includes degraded)
Expand Down
4 changes: 2 additions & 2 deletions tests/unittests/cmd/test_status.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,7 @@ def fake_sleep(interval):
assert retcode == 0
assert sleep_calls == 4
out, _err = capsys.readouterr()
assert out == "....\nstatus: done\n"
assert out == "....status: done\n"

@mock.patch(M_PATH + "read_cfg_paths")
@mock.patch(
Expand Down Expand Up @@ -884,7 +884,7 @@ def fake_sleep(interval):
assert retcode == 1
assert sleep_calls == 4
out, _err = capsys.readouterr()
assert out == "....\nstatus: error\n"
assert out == "....status: error\n"

@mock.patch(M_PATH + "read_cfg_paths")
@mock.patch(
Expand Down
1 change: 1 addition & 0 deletions tools/.github-cla-signers
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ mitechie
MjMoshiri
mxwebdev
nazunalika
nelsonad-ops
netcho
nicolasbock
nishigori
Expand Down