summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-07-30 15:14:49 -0400
committerGitHub <noreply@github.com>2020-07-30 15:14:49 -0400
commit4132b71478c486b3f4eff6a344ee1b2defbab86f (patch)
tree1a9f74331aea2ca0657b7f4222197bec09abb98e
parentca2bda64206134a4b1bec5f8934bf6a3c46cfbfd (diff)
parentb4fa2c2517fd313bb0000f7697274d2ab2498265 (diff)
downloadpodman-4132b71478c486b3f4eff6a344ee1b2defbab86f.tar.gz
podman-4132b71478c486b3f4eff6a344ee1b2defbab86f.tar.bz2
podman-4132b71478c486b3f4eff6a344ee1b2defbab86f.zip
Merge pull request #7156 from zhangguanzhang/master
fix podman system df format error
-rw-r--r--cmd/podman/system/df.go9
-rw-r--r--test/system/320-system-df.bats7
2 files changed, 13 insertions, 3 deletions
diff --git a/cmd/podman/system/df.go b/cmd/podman/system/df.go
index a320eb5c7..03991101e 100644
--- a/cmd/podman/system/df.go
+++ b/cmd/podman/system/df.go
@@ -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
}
diff --git a/test/system/320-system-df.bats b/test/system/320-system-df.bats
index a96507448..217357b37 100644
--- a/test/system/320-system-df.bats
+++ b/test/system/320-system-df.bats
@@ -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)
#