X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fpost%2Ftest-post-common.sh;h=4535ff891e911e0fcd75231b9f5868c961c3d6c8;hb=293b37f3c3eab8af5c87c9ad8ee9df89c998cf48;hp=773e49dbdd4ccfb08f7ebd8d78b22b14adf49960;hpb=e0773dd7ba5dc3f1caabe66ce6b302b86abd1488;p=mmh

diff --git a/test/post/test-post-common.sh b/test/post/test-post-common.sh
index 773e49d..4535ff8 100755
--- a/test/post/test-post-common.sh
+++ b/test/post/test-post-common.sh
@@ -21,7 +21,9 @@ echo "clientname: nosuchhost.example.com" >> ${MHMTSCONF}
 #
 # One "post" test run.  Ok, yeah, we're using "send", but that's just
 # because it's easier.
-#
+# $1: output filename for fakesmtp, i.e., the sent message
+# $2: expected output
+# $3: optional switches for send
 
 test_post ()
 { "${MH_OBJ_DIR}/test/fakesmtp" "$1" $localport &
@@ -30,14 +32,19 @@ test_post ()
     # 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
+    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 1
+        sleep 2
     done
-    [ $status -eq 0 ] || exit 1
+    if [ $status -ne 0 ]; then
+      printf '%s: send failed, was fakesmtp given enough time to start?\n' \
+             "$0" >&2
+      exit 1
+    fi
 
     wait ${pid}