summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-09-02 03:01:19 -0400
committerGitHub <noreply@github.com>2021-09-02 03:01:19 -0400
commit4207d959a68c1ee2b805b7113838580c14f4bbc6 (patch)
tree00990a26e16965a735f9c1b2a7645371a917a8b8
parentc36322382a5cfaa50131f45ffb723b738f3b85ce (diff)
parente3c7e02a0e1f0f224071940f809474a0593c6949 (diff)
downloadpodman-4207d959a68c1ee2b805b7113838580c14f4bbc6.tar.gz
podman-4207d959a68c1ee2b805b7113838580c14f4bbc6.tar.bz2
podman-4207d959a68c1ee2b805b7113838580c14f4bbc6.zip
Merge pull request #11395 from edsantiago/bats
System tests: add cleanup & debugging output
-rw-r--r--test/system/260-sdnotify.bats4
-rw-r--r--test/system/700-play.bats1
2 files changed, 5 insertions, 0 deletions
diff --git a/test/system/260-sdnotify.bats b/test/system/260-sdnotify.bats
index b5d3f9b86..0dae569a8 100644
--- a/test/system/260-sdnotify.bats
+++ b/test/system/260-sdnotify.bats
@@ -157,6 +157,10 @@ function _assert_mainpid_is_conmon() {
# With container, READY=1 isn't necessarily the last message received;
# just look for it anywhere in received messages
run cat $_SOCAT_LOG
+ # The 'echo's help us debug failed runs
+ echo "socat log:"
+ echo "$output"
+
is "$output" ".*READY=1" "received READY=1 through notify socket"
_assert_mainpid_is_conmon "${lines[0]}"
diff --git a/test/system/700-play.bats b/test/system/700-play.bats
index 498956b9a..7f35877aa 100644
--- a/test/system/700-play.bats
+++ b/test/system/700-play.bats
@@ -140,4 +140,5 @@ _EOF
run_podman inspect --format "{{ .Config.User }}" test_pod-test
is "$output" bin "expect container within pod to run as the bin user"
run_podman pod rm -f test_pod
+ run_podman rmi -f userimage:latest
}