X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fpost%2Ftest-post-common.sh;h=773e49dbdd4ccfb08f7ebd8d78b22b14adf49960;hb=d4850ff231bec8513dcd106bdb93bc61d179d8f6;hp=c35a5a256e83cb87f53ecd299077e87791bd80f9;hpb=01ccb3f07cef6989517ff99252ca00b0e1c1c07c;p=mmh

diff --git a/test/post/test-post-common.sh b/test/post/test-post-common.sh
index c35a5a2..773e49d 100755
--- a/test/post/test-post-common.sh
+++ b/test/post/test-post-common.sh
@@ -27,9 +27,19 @@ test_post ()
 { "${MH_OBJ_DIR}/test/fakesmtp" "$1" $localport &
     pid="$!"
 
-    send -draft -server 127.0.0.1 -port $localport || exit 1
-
-    wait $!
+    # 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}
 
     #
     # It's hard to calculate the exact Date: header post is going to
@@ -37,9 +47,8 @@ test_post ()
     # compare it against our "correct" output.
     #
 
-    sed -i.bak -e 's/^Date:.*/Date:/' "$1"
-
-    rm -f "${1}.bak"
+    sed -e 's/^Date:.*/Date:/' "$1" > "$1".nodate
+    rm -f "$1"
 
-    check "$1" "$2"
+    check "$1".nodate "$2"
 }