diff options
| author | Ed Santiago <santiago@redhat.com> | 2021-12-09 08:23:43 -0700 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2021-12-09 08:23:43 -0700 |
| commit | 18854f5666a0299e7a776a4f72e9cc056d451c89 (patch) | |
| tree | be1562cd6eda1aa4410771369041528fe0b9cd97 | |
| parent | 4a52a457d1e33a4817e4ce1dca390ba942eaec44 (diff) | |
| download | podman-18854f5666a0299e7a776a4f72e9cc056d451c89.tar.gz podman-18854f5666a0299e7a776a4f72e9cc056d451c89.tar.bz2 podman-18854f5666a0299e7a776a4f72e9cc056d451c89.zip | |
System tests: remove rm_pause_image()
...it's not needed: teardown() already does it. Or, it would,
if it had been updated to deal with the new pause image naming
convention, which I've just done.
Signed-off-by: Ed Santiago <santiago@redhat.com>
| -rw-r--r-- | test/system/200-pod.bats | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/test/system/200-pod.bats b/test/system/200-pod.bats index 60cfbc9dd..b166914db 100644 --- a/test/system/200-pod.bats +++ b/test/system/200-pod.bats @@ -8,7 +8,7 @@ function teardown() { run_podman rm -f -t 0 -a run_podman image list --format '{{.ID}} {{.Repository}}' while read id name; do - if [[ "$name" =~ /pause ]]; then + if [[ "$name" =~ /podman-pause ]]; then run_podman rmi $id fi done <<<"$output" @@ -79,11 +79,6 @@ EOF is "$output" ".*initializing source docker://$image:.*" } -function rm_podman_pause_image() { - run_podman version --format "{{.Server.Version}}-{{.Server.Built}}" - run_podman rmi -f "localhost/podman-pause:$output" -} - @test "podman pod - communicating between pods" { podname=pod$(random_string) run_podman 1 pod exists $podname @@ -129,8 +124,6 @@ function rm_podman_pause_image() { # Pod no longer exists run_podman 1 pod exists $podid run_podman 1 pod exists $podname - - rm_podman_pause_image } @test "podman pod - communicating via /dev/shm " { @@ -154,7 +147,6 @@ function rm_podman_pause_image() { # Pause image hasn't been pulled run_podman 1 image exists k8s.gcr.io/pause:3.5 - rm_podman_pause_image } # Random byte @@ -343,7 +335,6 @@ EOF # Pause image hasn't been pulled run_podman 1 image exists k8s.gcr.io/pause:3.5 - rm_podman_pause_image } # vim: filetype=sh |