From 1345d0358b741093eae139d06fdd78d379070fa0 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Mon, 14 Dec 2020 11:25:01 -0700 Subject: system tests: the catch-up game - run test: minor cleanup to .containerenv test. Basically, make it do only two podman-runs (they're expensive) and tighten up the results checks - ps test: add ps -a --storage. Requires small tweak to run_podman helper, so we can have "timeout" be an expected result - sdnotify test: workaround for #8718 (seeing MAINPID=xxx as last output line instead of READY=1). As found by the newly-added debugging echos, what we are seeing is: MAINPID=103530 READY=1 MAINPID=103530 It's not supposed to be that way; it's supposed to be just the first two. But when faced with reality, we must bend to accommodate it, so let's accept READY=1 anywhere in the output stream, not just as the last line. Signed-off-by: Ed Santiago --- test/system/helpers.bash | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'test/system/helpers.bash') diff --git a/test/system/helpers.bash b/test/system/helpers.bash index f782de080..a4b89ec99 100644 --- a/test/system/helpers.bash +++ b/test/system/helpers.bash @@ -168,8 +168,11 @@ function run_podman() { if [ "$status" -eq 124 ]; then if expr "$output" : ".*timeout: sending" >/dev/null; then - echo "*** TIMED OUT ***" - false + # It's possible for a subtest to _want_ a timeout + if [[ "$expected_rc" != "124" ]]; then + echo "*** TIMED OUT ***" + false + fi fi fi -- cgit v1.2.3-54-g00ecf