diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-10-04 15:10:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-04 15:10:36 -0400 |
| commit | a866a2f159f94976277d8a3a9459724af0b0f62f (patch) | |
| tree | 341b34bcd9dc87efada13a522bb21c31097fef8a /test/system/055-rm.bats | |
| parent | 2f72f17a114f4e20b56deb2c21908d1d4610919c (diff) | |
| parent | 21c9dc3c406bb486c44c4a27e5b0497bab1cd40d (diff) | |
| download | podman-a866a2f159f94976277d8a3a9459724af0b0f62f.tar.gz podman-a866a2f159f94976277d8a3a9459724af0b0f62f.tar.bz2 podman-a866a2f159f94976277d8a3a9459724af0b0f62f.zip | |
Merge pull request #11763 from rhatdan/timeout
Add --time option for podman * rm -f flag
Diffstat (limited to 'test/system/055-rm.bats')
| -rw-r--r-- | test/system/055-rm.bats | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/system/055-rm.bats b/test/system/055-rm.bats index a5770f20f..7fe81c084 100644 --- a/test/system/055-rm.bats +++ b/test/system/055-rm.bats @@ -30,7 +30,7 @@ load helpers is "$output" "Error: cannot remove container $cid as it is running - running or paused containers cannot be removed without force: container state improper" "error message" # rm -f should succeed - run_podman rm -f $cid + run_podman rm -t 0 -f $cid } @test "podman rm container from storage" { @@ -70,7 +70,7 @@ load helpers # See https://github.com/containers/podman/issues/3795 @test "podman rm -f" { rand=$(random_string 30) - ( sleep 3; run_podman rm -f $rand ) & + ( sleep 3; run_podman rm -t 0 -f $rand ) & run_podman 137 run --name $rand $IMAGE sleep 30 } |