X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/fdc65105f4da4796ea11ede295622deae7690c18..3db525b0ba9a07177bb5709bdcee1f81dc06a7e3:/test/post/test-post-common.sh diff --git a/test/post/test-post-common.sh b/test/post/test-post-common.sh index e0eaa4ac..773e49db 100755 --- a/test/post/test-post-common.sh +++ b/test/post/test-post-common.sh @@ -27,7 +27,17 @@ test_post () { "${MH_OBJ_DIR}/test/fakesmtp" "$1" $localport & pid="$!" - send -draft -server 127.0.0.1 -port $localport || exit 1 + # The server doesn't always come up fast enough, so sleep and + # retry a few times if it fails... + status=1 + for i in 0 1 2 3 4 5 6 7 8 9; do + if send -draft -server 127.0.0.1 -port $localport >/dev/null 2>&1; then + status=0 + break + fi + sleep 1 + done + [ $status -eq 0 ] || exit 1 wait ${pid} @@ -37,9 +47,8 @@ test_post () # compare it against our "correct" output. # - sed -i.bak -e 's/^Date:.*/Date:/' "$1" + sed -e 's/^Date:.*/Date:/' "$1" > "$1".nodate + rm -f "$1" - rm -f "${1}.bak" - - check "$1" "$2" + check "$1".nodate "$2" }