diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-12-09 18:07:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-09 18:07:19 +0000 |
| commit | c7ed2be8d2745eca7a9bcabf7f40e869baa8c5ec (patch) | |
| tree | 85bc7078a5c2ba85f17b524fadc17df5dec2163f | |
| parent | 9cfdffdfa35097e4c4d091e9cdc549f5740e4980 (diff) | |
| parent | 18854f5666a0299e7a776a4f72e9cc056d451c89 (diff) | |
| download | podman-c7ed2be8d2745eca7a9bcabf7f40e869baa8c5ec.tar.gz podman-c7ed2be8d2745eca7a9bcabf7f40e869baa8c5ec.tar.bz2 podman-c7ed2be8d2745eca7a9bcabf7f40e869baa8c5ec.zip | |
Merge pull request #12556 from edsantiago/rm_rm_podman_pause_image
System tests: remove rm_pause_image()
| -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 |