System tests: cleanup, make more robust

- run test: preserve --runtime test: use a random executable
  path. And, clean up better.

- run test: "look up correct image name" test: use random
  strings; test both without and with a :tag

- events test: use random label strings, add more filter tests

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago
2020-10-20 12:41:11 -06:00
parent 3a62b4d6b7
commit c93d4be41e
2 changed files with 54 additions and 22 deletions

View File

@@ -473,34 +473,53 @@ json-file | f
# run with --runtime should preserve the named runtime
@test "podman run : full path to --runtime is preserved" {
skip_if_cgroupsv1
skip_if_remote
run_podman run -d --runtime '/usr/bin/crun' $IMAGE sleep 60
skip_if_remote "podman-remote does not support --runtime option"
# Get configured runtime
run_podman info --format '{{.Host.OCIRuntime.Path}}'
runtime="$output"
# Assumes that /var/tmp is not mounted noexec; this is usually safe
new_runtime="/var/tmp/myruntime$(random_string 12)"
cp --preserve $runtime $new_runtime
run_podman run -d --runtime "$new_runtime" $IMAGE sleep 60
cid="$output"
run_podman inspect --format '{{.OCIRuntime}}' $cid
is "$output" "/usr/bin/crun"
is "$output" "$new_runtime" "podman inspect shows configured runtime"
run_podman kill $cid
run_podman rm $cid
rm -f $new_runtime
}
# Regression test for issue #8082
@test "podman run : look up correct image name" {
# Create a 2nd tag for the local image.
local name="localhost/foo/bar"
run_podman tag $IMAGE $name
# Create a 2nd tag for the local image. Force to lower case, and apply it.
local newtag="localhost/$(random_string 10)/$(random_string 8)"
newtag=${newtag,,}
run_podman tag $IMAGE $newtag
# Create a container with the 2nd tag and make sure that it's being
# used. #8082 always inaccurately used the 1st tag.
run_podman create $name
cid="$output"
# Create a container with the 2nd tag and make sure that it's being
# used. #8082 always inaccurately used the 1st tag.
run_podman create $newtag
cid="$output"
run_podman inspect --format "{{.ImageName}}" $cid
is "$output" "$name"
run_podman inspect --format "{{.ImageName}}" $cid
is "$output" "$newtag" "container .ImageName is the container-create name"
# Clean up.
run_podman rm $cid
run_podman untag $IMAGE $name
# Same thing, but now with a :tag, and making sure it works with --name
newtag2="${newtag}:$(random_string 6|tr A-Z a-z)"
run_podman tag $IMAGE $newtag2
cname="$(random_string 14|tr A-Z a-z)"
run_podman create --name $cname $newtag2
run_podman inspect --format "{{.ImageName}}" $cname
is "$output" "$newtag2" "container .ImageName is the container-create name"
# Clean up.
run_podman rm $cid $cname
run_podman untag $IMAGE $newtag $newtag2
}
# vim: filetype=sh