summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2021-09-01 11:29:59 -0600
committerEd Santiago <santiago@redhat.com>2021-09-01 11:29:59 -0600
commite3c7e02a0e1f0f224071940f809474a0593c6949 (patch)
tree8efc19a59bbb7d5f4f0d30d16adebb6660b84998
parentfff12da70e1c5c467e1171faf0b5fb3ef1067cfc (diff)
downloadpodman-e3c7e02a0e1f0f224071940f809474a0593c6949.tar.gz
podman-e3c7e02a0e1f0f224071940f809474a0593c6949.tar.bz2
podman-e3c7e02a0e1f0f224071940f809474a0593c6949.zip
System tests: add cleanup & debugging output
Cleanup: the final 'play' test wasn't cleaning up after itself, leading to angry warning messages when rerunning tests (in my environment; never in CI) Debug: I'm seeing a lot of "Could not parse READY=1 as MAINPID=nnn" flakes in the sdnotify:container test (nine in the past month). Add debug traces to help diagnose in future flakes. Signed-off-by: Ed Santiago <santiago@redhat.com>
-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
}