diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-16 00:43:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-16 00:43:03 +0000 |
| commit | 8333a9ee90078dd8cf1194f1df59bae70709bdf1 (patch) | |
| tree | 3caaa819643d0a844dfa9ae2268242501066dc43 /test/system/260-sdnotify.bats | |
| parent | 66e979a892df7dc820e6ce7ada0e3a34619c172f (diff) | |
| parent | 1345d0358b741093eae139d06fdd78d379070fa0 (diff) | |
| download | podman-8333a9ee90078dd8cf1194f1df59bae70709bdf1.tar.gz podman-8333a9ee90078dd8cf1194f1df59bae70709bdf1.tar.bz2 podman-8333a9ee90078dd8cf1194f1df59bae70709bdf1.zip | |
Merge pull request #8720 from edsantiago/bats
system tests: the catch-up game
Diffstat (limited to 'test/system/260-sdnotify.bats')
| -rw-r--r-- | test/system/260-sdnotify.bats | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/test/system/260-sdnotify.bats b/test/system/260-sdnotify.bats index c99ba4fa6..a5fa0f4e6 100644 --- a/test/system/260-sdnotify.bats +++ b/test/system/260-sdnotify.bats @@ -100,8 +100,17 @@ function _assert_mainpid_is_conmon() { run_podman logs sdnotify_conmon_c is "$output" "READY" "\$NOTIFY_SOCKET in container" + # The 'echo's help us debug failed runs run cat $_SOCAT_LOG - is "${lines[-1]}" "READY=1" "final output from sdnotify" + echo "socat log:" + echo "$output" + + # ARGH! 'READY=1' should always be the last output line. But sometimes, + # for reasons unknown, we get an extra MAINPID=xxx after READY=1 (#8718). + # Who knows if this is a systemd bug, or conmon, or what. I don't + # even know where to begin asking. So, to eliminate the test flakes, + # we look for READY=1 _anywhere_ in the output, not just the last line. + is "$output" ".*READY=1.*" "sdnotify sent READY=1" _assert_mainpid_is_conmon "${lines[0]}" |