diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-10-01 03:36:11 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-01 03:36:11 -0400 |
commit | 317e20a8d5a39088ea112f8321630aacfe27ddbc (patch) | |
tree | 934f83cc105ca3f619d07f7b41384c3d4c31a534 /test/system/125-import.bats | |
parent | f96c281f53cff68ac0715dac5da0f53eefa95b8b (diff) | |
parent | bf94ebf423931f6cd848126372fe558c8b956dcc (diff) | |
download | podman-317e20a8d5a39088ea112f8321630aacfe27ddbc.tar.gz podman-317e20a8d5a39088ea112f8321630aacfe27ddbc.tar.bz2 podman-317e20a8d5a39088ea112f8321630aacfe27ddbc.zip |
Merge pull request #11776 from edsantiago/bats_is_cleanup
System tests: tighten 'is' operator
Diffstat (limited to 'test/system/125-import.bats')
-rw-r--r-- | test/system/125-import.bats | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/system/125-import.bats b/test/system/125-import.bats index 5995d71bf..5b8d84a2f 100644 --- a/test/system/125-import.bats +++ b/test/system/125-import.bats @@ -20,26 +20,26 @@ load helpers # Simple import run_podman import -q $archive iid="$output" - run_podman run -t --rm $iid cat /random.txt + run_podman run --rm $iid cat /random.txt is "$output" "$random_content" "simple import" run_podman rmi -f $iid # Simple import via stdin run_podman import -q - < <(cat $archive) iid="$output" - run_podman run -t --rm $iid cat /random.txt + run_podman run --rm $iid cat /random.txt is "$output" "$random_content" "simple import via stdin" run_podman rmi -f $iid # Tagged import run_podman import -q $archive $fqin - run_podman run -t --rm $fqin cat /random.txt + run_podman run --rm $fqin cat /random.txt is "$output" "$random_content" "tagged import" run_podman rmi -f $fqin # Tagged import via stdin run_podman import -q - $fqin < <(cat $archive) - run_podman run -t --rm $fqin cat /random.txt + run_podman run --rm $fqin cat /random.txt is "$output" "$random_content" "tagged import via stdin" run_podman rmi -f $fqin } @@ -100,7 +100,7 @@ EOF # Confirm exit within timeout run_podman ps -a --filter name=$a_cnt --format '{{.Status}}' - is "$output" "Exited (33)" "Exit by non-TERM/KILL" + is "$output" "Exited (33) .*" "Exit by non-TERM/KILL" run_podman rm -f $a_cnt run_podman rmi $b_img $a_img |