X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fpost%2Ftest-post-common.sh;h=773e49dbdd4ccfb08f7ebd8d78b22b14adf49960;hb=1ae96ed565c1bb0ae054f81b47bf960d2b62e658;hp=856c399f4e83751bec0a8ba91f553fa8ecba9b5e;hpb=a3bf69c3a988b0de2126fbfe6804c61ef24a8896;p=mmh

diff --git a/test/post/test-post-common.sh b/test/post/test-post-common.sh
index 856c399..773e49d 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}
 
@@ -38,7 +48,7 @@ test_post ()
     #
 
     sed -e 's/^Date:.*/Date:/' "$1" > "$1".nodate
-    mv "$1".nodate "$1"
+    rm -f "$1"
 
-    check "$1" "$2"
+    check "$1".nodate "$2"
 }