X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fformat%2Ftest-mymbox;h=39ab4c11012fca3d24013ec91a748def577672c6;hb=c78ca8140562c7becb78b1f52f9fc86184cac9f3;hp=e1d1ead8b716cc085abc5c6e212132f59ca69e98;hpb=e107aac243dbd4021e57f4c455c7e3ffd82b819e;p=mmh

diff --git a/test/format/test-mymbox b/test/format/test-mymbox
index e1d1ead..39ab4c1 100755
--- a/test/format/test-mymbox
+++ b/test/format/test-mymbox
@@ -13,33 +13,28 @@ fi
 
 setup_test
 
-runtest()
-{
-	testoutput=$(${MH_LIB_DIR}/ap -format "%(mymbox{text})" "$1")
+user=${LOGNAME:-`id -un`}
+host=`${MH_OBJ_DIR}/test/getfqdn`
 
-	if [ -z "${testoutput}" ]; then
-		echo "Test program did not return anything for $3"
-		exit 1
-	fi
-
-	if [ "${testoutput}" -ne $2 ]; then
-		echo "Did not get expected output for $3"
-		exit 1
-	fi
-}
-
-user="$(id -un)"
-host="$(hostname)"
-
-runtest "${user}" 1 "Basic user test"
-runtest "${user}@${host}" 1 "Basic user@host test"
-runtest "nosuchuser@nosuchhost.blah" 0 "Basic non-matching test"
+run_test "${MH_LIB_DIR}/ap -format %(mymbox{text}) ${user}" \
+         1 "Basic user test"
+run_test "${MH_LIB_DIR}/ap -format %(mymbox{text}) ${user}@${host}" \
+         1 "Basic user@host test"
+run_test "${MH_LIB_DIR}/ap -format %(mymbox{text}) nosuchuser@nosuchhost.blah" \
+         0 "Basic non-matching test"
 
 myname="Random User <random@user.something.com>"
 
+#### Remove existing Local-Mailbox: profile component, if any.  Then
+#### add one.
+grep -v 'Local-Mailbox: ' ${MH} > ${MH}.new
+mv -f ${MH}.new ${MH}
 echo "Local-Mailbox: ${myname}" >> ${MH}
 
-runtest "${myname}" 1 "Local-Mailbox test"
-runtest "${user}@${host}" 0 "Local-mailbox overriding user@host test"
+run_test "echo `${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${myname}"`" \
+         1 "Local-Mailbox test"
+
+run_test "${MH_LIB_DIR}/ap -format %(mymbox{text}) ${user}@${host}" \
+         0 "Local-mailbox overriding user@host test"
 
-exit 0
+exit $failed