X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fpost%2Ftest-post-common.sh;h=3b1a3d0b9b99840281dd997a42774f61a2f56374;hb=39a6bb2ad6c87e55d25115eb7d8e9a4043fec2e1;hp=4535ff891e911e0fcd75231b9f5868c961c3d6c8;hpb=2ffe7ca30b85d542d02f74c39785319bcb6ad005;p=mmh diff --git a/test/post/test-post-common.sh b/test/post/test-post-common.sh index 4535ff8..3b1a3d0 100755 --- a/test/post/test-post-common.sh +++ b/test/post/test-post-common.sh @@ -26,27 +26,9 @@ echo "clientname: nosuchhost.example.com" >> ${MHMTSCONF} # $3: optional switches for send test_post () -{ "${MH_OBJ_DIR}/test/fakesmtp" "$1" $localport & - pid="$!" - - # The server doesn't always come up fast enough, so sleep and - # retry a few times if it fails... - status=1 - for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do - if send -draft -server 127.0.0.1 -port $localport $3 - then - status=0 - break - fi - sleep 2 - done - if [ $status -ne 0 ]; then - printf '%s: send failed, was fakesmtp given enough time to start?\n' \ - "$0" >&2 - exit 1 - fi - - wait ${pid} +{ pid=`"${MH_OBJ_DIR}/test/fakesmtp" "$1" $localport` + + send -draft -server 127.0.0.1 -port $localport $3 || exit 1 # # It's hard to calculate the exact Date: header post is going to