summaryrefslogtreecommitdiff
path: root/test/e2e
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-01-27 10:33:30 -0500
committerGitHub <noreply@github.com>2021-01-27 10:33:30 -0500
commitd8f34500088ed50264fba4a770699728099c474a (patch)
treec9afefa6d5237c2725aa2888cb3f0e480b3db3b2 /test/e2e
parent179b9d1745db19cb420b0a8f8d6afa4dfc07dd91 (diff)
parent21cb3043fcae3f9196a2faeddbaba891f9f3f49c (diff)
downloadpodman-d8f34500088ed50264fba4a770699728099c474a.tar.gz
podman-d8f34500088ed50264fba4a770699728099c474a.tar.bz2
podman-d8f34500088ed50264fba4a770699728099c474a.zip
Merge pull request #9095 from rhatdan/ps
podman-remote ps --external --pod --sort do not work.
Diffstat (limited to 'test/e2e')
-rw-r--r--test/e2e/ps_test.go7
-rw-r--r--test/e2e/rm_test.go2
2 files changed, 6 insertions, 3 deletions
diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go
index 13701fc3b..d12534219 100644
--- a/test/e2e/ps_test.go
+++ b/test/e2e/ps_test.go
@@ -396,11 +396,14 @@ var _ = Describe("Podman ps", func() {
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
- session = podmanTest.Podman([]string{"ps", "--pod", "--no-trunc"})
-
+ session = podmanTest.Podman([]string{"ps", "--no-trunc"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
+ Expect(session.OutputToString()).To(Not(ContainSubstring(podid)))
+ session = podmanTest.Podman([]string{"ps", "--pod", "--no-trunc"})
+ session.WaitWithDefaultTimeout()
+ Expect(session.ExitCode()).To(Equal(0))
Expect(session.OutputToString()).To(ContainSubstring(podid))
})
diff --git a/test/e2e/rm_test.go b/test/e2e/rm_test.go
index ca142d7f3..4c50a61ef 100644
--- a/test/e2e/rm_test.go
+++ b/test/e2e/rm_test.go
@@ -132,7 +132,7 @@ var _ = Describe("Podman rm", func() {
latest := "-l"
if IsRemote() {
- latest = "test1"
+ latest = cid
}
result := podmanTest.Podman([]string{"rm", latest})
result.WaitWithDefaultTimeout()