summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-10-20 07:25:35 -0400
committerGitHub <noreply@github.com>2020-10-20 07:25:35 -0400
commitf9450300b73e18890f7264bffca35b291aa3176e (patch)
tree1764522482b97b6fdf86c21e5d2505aa6e49b89c /test
parente944544271d9e515bdfc7e364e3ddf372b0dd378 (diff)
parentb23d430516a20f0274c200c2d67bf0e1b05bff18 (diff)
downloadpodman-f9450300b73e18890f7264bffca35b291aa3176e.tar.gz
podman-f9450300b73e18890f7264bffca35b291aa3176e.tar.bz2
podman-f9450300b73e18890f7264bffca35b291aa3176e.zip
Merge pull request #8061 from edsantiago/bats
System tests: remove some misleading 'run's
Diffstat (limited to 'test')
-rw-r--r--test/system/030-run.bats20
-rw-r--r--test/system/055-rm.bats9
-rw-r--r--test/system/140-diff.bats6
-rw-r--r--test/system/helpers.bash8
4 files changed, 17 insertions, 26 deletions
diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index f7c48da8d..28dc7c7a7 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -460,24 +460,4 @@ json-file | f
is "$output" "$expect" "podman run with --tz=local, matches host"
}
-@test "podman container exists" {
- rand=$(random_string 30)
- run_podman 1 container exists myctr
-
- run_podman create --name myctr $IMAGE /bin/true
- run_podman container exists myctr
-
- # Create a container that podman does not know about
- run buildah from $IMAGE
- cid="$output"
-
- # exists should fail
- run_podman 1 container exists $cid
-
- # exists should succeed
- run_podman container exists --external $cid
-
- run buildah rm $cid
-}
-
# vim: filetype=sh
diff --git a/test/system/055-rm.bats b/test/system/055-rm.bats
index 7176ae4b8..0107114b5 100644
--- a/test/system/055-rm.bats
+++ b/test/system/055-rm.bats
@@ -41,11 +41,14 @@ load helpers
run_podman create --name $rand $IMAGE /bin/true
# Create a container that podman does not know about
- run buildah from $IMAGE
- cid="$output"
+ external_cid=$(buildah from $IMAGE)
+
+ # Plain 'exists' should fail, but should succeed with --external
+ run_podman 1 container exists $external_cid
+ run_podman container exists --external $external_cid
# rm should succeed
- run_podman rm $rand $cid
+ run_podman rm $rand $external_cid
}
# I'm sorry! This test takes 13 seconds. There's not much I can do about it,
diff --git a/test/system/140-diff.bats b/test/system/140-diff.bats
index d0f33e438..1277f9bbe 100644
--- a/test/system/140-diff.bats
+++ b/test/system/140-diff.bats
@@ -34,8 +34,8 @@ load helpers
@test "podman diff with buildah container " {
rand_file=$(random_string 10)
- run buildah from --name buildahctr $IMAGE
- run buildah run buildahctr sh -c "touch /$rand_file;rm /etc/services"
+ buildah from --name buildahctr $IMAGE
+ buildah run buildahctr sh -c "touch /$rand_file;rm /etc/services"
run_podman diff --format json buildahctr
@@ -51,7 +51,7 @@ load helpers
is "$result" "${expect[$field]}" "$field"
done
- run buildah rm buildahctr
+ buildah rm buildahctr
}
# vim: filetype=sh
diff --git a/test/system/helpers.bash b/test/system/helpers.bash
index 4591c9015..73cf1e5b2 100644
--- a/test/system/helpers.bash
+++ b/test/system/helpers.bash
@@ -34,6 +34,14 @@ function basic_setup() {
# Clean up all containers
run_podman rm --all --force
+ # ...including external (buildah) ones
+ run_podman ps --all --external --format '{{.ID}} {{.Names}}'
+ for line in "${lines[@]}"; do
+ set $line
+ echo "# setup(): removing stray external container $1 ($2)" >&3
+ run_podman rm $1
+ done
+
# Clean up all images except those desired
found_needed_image=
run_podman images --all --format '{{.Repository}}:{{.Tag}} {{.ID}}'