From c618a906a4a50b4cc76e9230f971d737a59b8c27 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Mon, 9 Dec 2013 16:59:42 -0800 Subject: [PATCH] fix size in -tree --- commands.go | 2 +- integration/commands_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/commands.go b/commands.go index 935dd33913..3546c9a41b 100644 --- a/commands.go +++ b/commands.go @@ -1268,7 +1268,7 @@ func (cli *DockerCli) printTreeNode(noTrunc bool, image APIImages, prefix string imageID = utils.TruncateID(image.ID) } - fmt.Fprintf(cli.out, "%s%s Size: %s (virtual %s)", prefix, imageID, utils.HumanSize(image.Size), utils.HumanSize(image.VirtualSize)) + fmt.Fprintf(cli.out, "%s%s Virtual Size: %s", prefix, imageID, utils.HumanSize(image.VirtualSize)) if image.RepoTags[0] != ":" { fmt.Fprintf(cli.out, " Tags: %s\n", strings.Join(image.RepoTags, ", ")) } else { diff --git a/integration/commands_test.go b/integration/commands_test.go index 16e2b3fb02..7bba37a51b 100644 --- a/integration/commands_test.go +++ b/integration/commands_test.go @@ -867,11 +867,11 @@ func TestImagesTree(t *testing.T) { } cmdOutput := string(cmdOutputBytes) regexpStrings := []string{ - fmt.Sprintf("└─%s Size: (\\d+.\\d+ MB) \\(virtual \\d+.\\d+ MB\\) Tags: %s:latest", unitTestImageIDShort, unitTestImageName), + fmt.Sprintf("└─%s Virtual Size: \\d+.\\d+ MB Tags: %s:latest", unitTestImageIDShort, unitTestImageName), "(?m) └─[0-9a-f]+.*", "(?m) └─[0-9a-f]+.*", "(?m) └─[0-9a-f]+.*", - fmt.Sprintf("(?m)^ └─%s Size: \\d+ B \\(virtual \\d+.\\d+ MB\\) Tags: test:latest", utils.TruncateID(image.ID)), + fmt.Sprintf("(?m)^ └─%s Virtual Size: \\d+.\\d+ MB Tags: test:latest", utils.TruncateID(image.ID)), } compiledRegexps := []*regexp.Regexp{}