summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/e2e/rmi_test.go4
-rw-r--r--test/system/200-pod.bats3
2 files changed, 1 insertions, 6 deletions
diff --git a/test/e2e/rmi_test.go b/test/e2e/rmi_test.go
index 150726ce4..b17c03d63 100644
--- a/test/e2e/rmi_test.go
+++ b/test/e2e/rmi_test.go
@@ -75,7 +75,6 @@ var _ = Describe("Podman rmi", func() {
})
It("podman rmi tagged image", func() {
- Skip(v2remotefail)
setup := podmanTest.PodmanNoCache([]string{"images", "-q", ALPINE})
setup.WaitWithDefaultTimeout()
Expect(setup).Should(Exit(0))
@@ -92,7 +91,6 @@ var _ = Describe("Podman rmi", func() {
})
It("podman rmi image with tags by ID cannot be done without force", func() {
- Skip(v2remotefail)
setup := podmanTest.PodmanNoCache([]string{"images", "-q", ALPINE})
setup.WaitWithDefaultTimeout()
Expect(setup).Should(Exit(0))
@@ -114,7 +112,6 @@ var _ = Describe("Podman rmi", func() {
})
It("podman rmi image that is a parent of another image", func() {
- SkipIfRemote()
session := podmanTest.PodmanNoCache([]string{"rmi", "-fa"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
@@ -153,7 +150,6 @@ var _ = Describe("Podman rmi", func() {
})
It("podman rmi image that is created from another named imaged", func() {
- SkipIfRemote()
session := podmanTest.PodmanNoCache([]string{"rmi", "-fa"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
diff --git a/test/system/200-pod.bats b/test/system/200-pod.bats
index f3d278826..e3643a3bd 100644
--- a/test/system/200-pod.bats
+++ b/test/system/200-pod.bats
@@ -147,8 +147,7 @@ function random_ip() {
pod_id="$output"
# Check --pod-id-file
- # FIXME: broken in master; reenable once #6292 is fixed
- #is "$(<$pod_id_file)" "$pod_id" "contents of pod-id-file"
+ is "$(<$pod_id_file)" "$pod_id" "contents of pod-id-file"
# Check each of the options
if ! is_rootless; then