Don't `else' after return. Simplify control flow.

[nmh] / test / post / test-post-common.sh

diff --git a/test/post/test-post-common.sh b/test/post/test-post-common.sh
index bd37c7d7b0110102caaa22e5b5fd40825bd0b17b..66feddca8c3f69d19b6142e97534e046b8644270 100755 (executable)
--- a/test/post/test-post-common.sh
+++ b/test/post/test-post-common.sh
@@ -9,7 +9,8 @@ set -e
 
 setup_test
 
-localport=65412
+arith_eval 64000 + $$ % 1000
+localport=$arith_val
 testname="${MH_TEST_DIR}/$$"
 
 #
@@ -26,23 +27,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 0 1 2 3 4 5 6 7 8 9; do
-        if send -draft -server 127.0.0.1 -port $localport $3 >/dev/null 2>&1
-        then
-            status=0
-            break
-        fi
-        sleep 1
-    done
-    [ $status -eq 0 ] || exit 1
-
-    wait ${pid}
+{ pid=`"${MH_OBJ_DIR}/test/fakesmtp" "$1" $localport`
+
+    run_prog send -draft -server 127.0.0.1 -port $localport $3
 
     #
     # It's hard to calculate the exact Date: header post is going to