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/125-import.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/125-import.bats')
| -rw-r--r-- | test/system/125-import.bats | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/system/125-import.bats b/test/system/125-import.bats index 5b8d84a2f..743da85b2 100644 --- a/test/system/125-import.bats +++ b/test/system/125-import.bats @@ -15,7 +15,7 @@ load helpers run_podman run --name import $IMAGE sh -c "echo ${random_content} > /random.txt" run_podman export import -o $archive - run_podman rm -f import + run_podman rm -t 0 -f import # Simple import run_podman import -q $archive @@ -71,7 +71,7 @@ EOF # Export built container as tarball run_podman export -o $PODMAN_TMPDIR/$b_cnt.tar $b_cnt - run_podman rm -f $b_cnt + run_podman rm -t 0 -f $b_cnt # Modify tarball contents tar --delete -f $PODMAN_TMPDIR/$b_cnt.tar tmp/testfile1 @@ -102,7 +102,7 @@ EOF run_podman ps -a --filter name=$a_cnt --format '{{.Status}}' is "$output" "Exited (33) .*" "Exit by non-TERM/KILL" - run_podman rm -f $a_cnt + run_podman rm -t 0 -f $a_cnt run_podman rmi $b_img $a_img } |