fix podman system df format error

Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
This commit is contained in:
zhangguanzhang
2020-07-31 00:22:32 +08:00
parent 05b3e0e16b
commit b4fa2c2517
2 changed files with 13 additions and 3 deletions

View File

@ -4,6 +4,7 @@ import (
"fmt"
"io"
"os"
"strconv"
"strings"
"text/tabwriter"
"text/template"
@ -69,6 +70,14 @@ func printSummary(reports *entities.SystemDfReport, userFormat string) error {
// Images
if len(userFormat) > 0 {
if !strings.HasSuffix(userFormat, `\n`) {
userFormat += `\n`
}
// should be Unquoto from cmd line
userFormat, err := strconv.Unquote(`"` + userFormat + `"`)
if err != nil {
return err
}
format = userFormat
}

View File

@ -24,9 +24,10 @@ function teardown() {
run_podman run -d -v /myvol2 --name c2 $IMAGE \
sh -c 'while ! test -e /stop; do sleep 0.1;done'
run_podman system df --format '{{ .Type }}:{{ .Total }}:{{ .Active }}--'
# FIXME: if/when #7149 gets fixed, split this into three tests (i.e. test "${lines[0]}", [1], [2] )
is "$output" "Images:1:1--Containers:2:1--Local Volumes:2:1--"
run_podman system df --format '{{ .Type }}:{{ .Total }}:{{ .Active }}'
is "${lines[0]}" "Images:1:1" "system df : Images line"
is "${lines[1]}" "Containers:2:1" "system df : Containers line"
is "${lines[2]}" "Local Volumes:2:1" "system df : Volumes line"
# Try -v. (Grrr. No way to specify individual formats)
#