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

diff --git a/test/format/test-mymbox b/test/format/test-mymbox
index e3decd9..786d943 100755
--- a/test/format/test-mymbox
+++ b/test/format/test-mymbox
@@ -13,24 +13,32 @@ fi
 
 setup_test
 
-user="`id -un`"
-host="`hostname`"
-
-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"
+#### Use ap to get the username.  That will either be what's in the
+#### Local-Mailbox profile component, which we don't use in the test
+#### suite, or the user's login name.  ap will escape (quote) it if
+#### needed.
+user=`${MH_LIB_DIR}/ap -format '%(me)' 0`
+host=`${MH_OBJ_DIR}/test/getfqdn`
+
+output=`${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${user}"`
+run_test "echo $output" 1 "Basic user test"
+output=`${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${user}@${host}"`
+run_test "echo $output" 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}
 
 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"
+output=`${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${user}@${host}"`
+run_test "echo $output" 0 "Local-mailbox overriding user@host test"
 
 exit $failed