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

diff --git a/test/format/test-mymbox b/test/format/test-mymbox
index e3decd9..39ab4c1 100755
--- a/test/format/test-mymbox
+++ b/test/format/test-mymbox
@@ -13,8 +13,8 @@ fi
 
 setup_test
 
-user="`id -un`"
-host="`hostname`"
+user=${LOGNAME:-`id -un`}
+host=`${MH_OBJ_DIR}/test/getfqdn`
 
 run_test "${MH_LIB_DIR}/ap -format %(mymbox{text}) ${user}" \
          1 "Basic user test"
@@ -25,6 +25,10 @@ run_test "${MH_LIB_DIR}/ap -format %(mymbox{text}) nosuchuser@nosuchhost.blah" \
 
 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}
 
 run_test "echo `${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${myname}"`" \