System tests: add cleanup & debugging output

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]}"

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
 }