summaryrefslogtreecommitdiff
path: root/test/e2e
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-02-01 03:23:29 +0100
committerGitHub <noreply@github.com>2019-02-01 03:23:29 +0100
commite133834f6d60310ecd6cbd67b58f891f29b25e10 (patch)
treead2e81dd1262470d5614966ee176632525219457 /test/e2e
parent82550ede36dab0689914c3c1b6de44b55f0d22f8 (diff)
parentca53122338168c867e75de0ce832d80ac7f27428 (diff)
downloadpodman-e133834f6d60310ecd6cbd67b58f891f29b25e10.tar.gz
podman-e133834f6d60310ecd6cbd67b58f891f29b25e10.tar.bz2
podman-e133834f6d60310ecd6cbd67b58f891f29b25e10.zip
Merge pull request #2232 from baude/pstable
Fix regression in ps with custom format
Diffstat (limited to 'test/e2e')
-rw-r--r--test/e2e/ps_test.go7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go
index bff2427d5..9b1c55bb4 100644
--- a/test/e2e/ps_test.go
+++ b/test/e2e/ps_test.go
@@ -7,6 +7,7 @@ import (
"os"
"regexp"
"sort"
+ "strings"
. "github.com/containers/libpod/test/utils"
"github.com/docker/go-units"
@@ -148,10 +149,12 @@ var _ = Describe("Podman ps", func() {
_, ec, _ := podmanTest.RunLsContainer("test1")
Expect(ec).To(Equal(0))
- result := podmanTest.Podman([]string{"ps", "-a", "--format", "\"table {{.ID}} {{.Image}} {{.Labels}}\""})
+ result := podmanTest.Podman([]string{"ps", "-a", "--format", "table {{.ID}} {{.Image}} {{.Labels}}"})
result.WaitWithDefaultTimeout()
+ Expect(strings.Contains(result.OutputToStringArray()[0], "table")).To(BeFalse())
+ Expect(strings.Contains(result.OutputToStringArray()[0], "ID")).To(BeTrue())
+ Expect(strings.Contains(result.OutputToStringArray()[1], "alpine:latest")).To(BeTrue())
Expect(result.ExitCode()).To(Equal(0))
- Expect(result.IsJSONOutputValid()).To(BeTrue())
})
It("podman ps ancestor filter flag", func() {