ps: --format {{.State}} match docker output
We should return the raw state string without any extra formatting in this case. `{{.Status}}` returns the nicely formatted string used in the default ps output, e.g. `Up 2 seconds ago`, while `{{.State}}` returns the state as string, e.g. `running`. This matches the docker output and allows better use in scripts. Fixes #18244 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
parent
d05a980792
commit
c5a928c5b7
|
@ -351,8 +351,8 @@ func (l psReporter) Pod() string {
|
|||
return l.ListContainer.Pod
|
||||
}
|
||||
|
||||
// State returns the container state in human duration
|
||||
func (l psReporter) State() string {
|
||||
// Status returns the container status in the default ps output format.
|
||||
func (l psReporter) Status() string {
|
||||
var state string
|
||||
switch l.ListContainer.State {
|
||||
case "running":
|
||||
|
@ -370,16 +370,11 @@ func (l psReporter) State() string {
|
|||
//nolint:staticcheck
|
||||
state = strings.Title(l.ListContainer.State)
|
||||
}
|
||||
return state
|
||||
}
|
||||
|
||||
// Status is a synonym for State()
|
||||
func (l psReporter) Status() string {
|
||||
hc := l.ListContainer.Status
|
||||
if hc != "" {
|
||||
return l.State() + " (" + hc + ")"
|
||||
state += " (" + hc + ")"
|
||||
}
|
||||
return l.State()
|
||||
return state
|
||||
}
|
||||
|
||||
func (l psReporter) RunningFor() string {
|
||||
|
|
|
@ -14,8 +14,8 @@ load helpers
|
|||
|
||||
# Special case: formatted ps
|
||||
run_podman ps --no-trunc \
|
||||
--format '{{.ID}} {{.Image}} {{.Command}} {{.Names}}'
|
||||
is "$output" "$cid $IMAGE sleep 5 $rand_name" "podman ps"
|
||||
--format '{{.ID}} {{.Image}} {{.Command}} {{.Names}} {{.State}}'
|
||||
is "$output" "$cid $IMAGE sleep 5 $rand_name running" "podman ps"
|
||||
|
||||
|
||||
# Plain old regular ps
|
||||
|
|
Loading…
Reference in New Issue