summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-03-16 12:51:50 +0100
committerGitHub <noreply@github.com>2020-03-16 12:51:50 +0100
commit4e13ef58c812a11f145d5d476587e54f6c97ed19 (patch)
tree7ac846bd14efc0d57a520fe55d6a9a4fbd75b942
parentaf1ac85da64dcf79c565f1277160d0047c6e0b2f (diff)
parent35857808760b41368d41a3a3e16807a1a0d282de (diff)
downloadpodman-4e13ef58c812a11f145d5d476587e54f6c97ed19.tar.gz
podman-4e13ef58c812a11f145d5d476587e54f6c97ed19.tar.bz2
podman-4e13ef58c812a11f145d5d476587e54f6c97ed19.zip
Merge pull request #5476 from edsantiago/run_rmi_test_fix
run --rmi test: make it work
-rw-r--r--test/system/030-run.bats35
1 files changed, 20 insertions, 15 deletions
diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index b89c76981..98c65f788 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -136,21 +136,26 @@ echo $rand | 0 | $rand
run_podman rmi busybox
}
-# 'run --rmi' deletes the image in the end unless it's used by another container.
-@test "podman run --rmi - remove image" {
- skip_if_remote "podman-remote does not emit 'Trying to pull' msgs"
- run_podman 0 run --rmi --rm redis /bin/true
- run_podman 1 image exists redis
-}
-
-
-@test "podman run --rmi - not remove image" {
- skip_if_remote "podman-remote does not emit 'Trying to pull' msgs"
- run_podman run redis /bin/true
- run_podman images | grep redis
- run_podman run --rmi --rm redis /bin/true
- run_podman images | grep redis
- run_podman 0 rm -a
+# 'run --rmi' deletes the image in the end unless it's used by another container
+@test "podman run --rmi" {
+ skip_if_remote
+
+ # Name of a nonlocal image. It should be pulled in by the first 'run'
+ NONLOCAL_IMAGE=busybox
+ run_podman 1 image exists $NONLOCAL_IMAGE
+
+ # Run a container, without --rm; this should block subsequent --rmi
+ run_podman run --name keepme $NONLOCAL_IMAGE /bin/true
+ run_podman image exists $NONLOCAL_IMAGE
+
+ # Now try running with --rmi : it should succeed, but not remove the image
+ run_podman run --rmi --rm $NONLOCAL_IMAGE /bin/true
+ run_podman image exists $NONLOCAL_IMAGE
+
+ # Remove the stray container, and run one more time with --rmi.
+ run_podman rm keepme
+ run_podman run --rmi --rm $NONLOCAL_IMAGE /bin/true
+ run_podman 1 image exists $NONLOCAL_IMAGE
}
# vim: filetype=sh