From 363cfcb0ce1477249a40861ef936f377b95aaf09 Mon Sep 17 00:00:00 2001 From: umohnani8 Date: Mon, 5 Feb 2018 10:15:36 -0500 Subject: Fix when the --format flag prints a new line at the end If the output is to a terminal, return a new line at the end of the output so that the output is visually appealing. If the output is being piped, or saved to a file, basically not being outputted to a terminal, do not print a new line at the end of the output. This ensures any further data manipulation with the results happens smoothly without requiring to remember the '/n' at the end of the output. Signed-off-by: umohnani8 --- test/e2e/images_test.go | 4 ++-- test/e2e/import_test.go | 2 +- test/e2e/ps_test.go | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'test/e2e') diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go index 099331c94..4c7c93e4b 100644 --- a/test/e2e/images_test.go +++ b/test/e2e/images_test.go @@ -32,7 +32,7 @@ var _ = Describe("Podman images", func() { session := podmanTest.Podman([]string{"images"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) - Expect(len(session.OutputToStringArray())).To(BeNumerically(">", 3)) + Expect(len(session.OutputToStringArray())).To(BeNumerically(">", 2)) Expect(session.LineInOuputStartsWith("docker.io/library/alpine")).To(BeTrue()) Expect(session.LineInOuputStartsWith("docker.io/library/busybox")).To(BeTrue()) }) @@ -48,6 +48,6 @@ var _ = Describe("Podman images", func() { session := podmanTest.Podman([]string{"images", "-qn"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) - Expect(len(session.OutputToStringArray())).To(BeNumerically(">", 2)) + Expect(len(session.OutputToStringArray())).To(BeNumerically(">", 1)) }) }) diff --git a/test/e2e/import_test.go b/test/e2e/import_test.go index 23208ca62..448a89539 100644 --- a/test/e2e/import_test.go +++ b/test/e2e/import_test.go @@ -62,7 +62,7 @@ var _ = Describe("Podman import", func() { results := podmanTest.Podman([]string{"images", "-q"}) results.WaitWithDefaultTimeout() Expect(results.ExitCode()).To(Equal(0)) - Expect(len(results.OutputToStringArray())).To(Equal(4)) + Expect(len(results.OutputToStringArray())).To(Equal(3)) }) It("podman import with message flag", func() { diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go index d0aa0bd7c..c4f23c944 100644 --- a/test/e2e/ps_test.go +++ b/test/e2e/ps_test.go @@ -4,6 +4,7 @@ import ( "os" "fmt" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) @@ -100,7 +101,7 @@ var _ = Describe("Podman ps", func() { result := podmanTest.Podman([]string{"ps", "--last", "2"}) result.WaitWithDefaultTimeout() Expect(result.ExitCode()).To(Equal(0)) - Expect(len(result.OutputToStringArray())).Should(Equal(4)) + Expect(len(result.OutputToStringArray())).Should(Equal(3)) }) It("podman ps no-trunc", func() { -- cgit v1.2.3-54-g00ecf