From 293b37f3c3eab8af5c87c9ad8ee9df89c998cf48 Mon Sep 17 00:00:00 2001
From: David Levine <levinedl@acm.org>
Date: Sat, 27 Oct 2012 12:18:45 -0500
Subject: [PATCH] In test-post-common.sh and test-mhmail, wait for fakesmtp to
 start for up to 40 seconds.  10 seconds wasn't long enough
 when I leaned on my machine.  Also, print out a message if
 exiting due to that timeout.

---
 test/mhmail/test-mhmail       |   12 ++++++++----
 test/post/test-post-common.sh |   10 +++++++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/test/mhmail/test-mhmail b/test/mhmail/test-mhmail
index c11e193..fa90586 100755
--- a/test/mhmail/test-mhmail
+++ b/test/mhmail/test-mhmail
@@ -27,7 +27,7 @@ test_mhmail ()
     # 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
+    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 [ $3 = '|' ]; then
           if printf '%s' "$4" | mhmail recipient@example.com $2 \
              -server 127.0.0.1 -port $localport; then
@@ -41,9 +41,13 @@ test_mhmail ()
               break
           fi
         fi
-        sleep 1
+        sleep 2
     done
-    [ $status -eq 0 ] || exit 1
+    if [ $status -ne 0 ]; then
+      printf '%s: mhmail failed, was fakesmtp given enough time to start?\n' \
+             "$0" >&2
+      exit 1
+    fi
 
     wait ${pid}
 
@@ -123,7 +127,7 @@ done
 printf 'inc: -version\n' >> $MH
 case `mhmail` in
   inc\ --*) ;;
-  *           ) echo "$0: mhmail generated unexpected output" 1>&2
+  *           ) echo "$0: mhmail generated unexpected output" >&2
                 failed=`expr ${failed:-0} + 1`;;
 esac
 
diff --git a/test/post/test-post-common.sh b/test/post/test-post-common.sh
index 1118d9c..4535ff8 100755
--- a/test/post/test-post-common.sh
+++ b/test/post/test-post-common.sh
@@ -32,15 +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
+    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}
 
-- 
1.7.10.4