X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d6b2ae5fa68b9a82ffc006c233aef64c5cdb3bd2..843bc850b2b7732c8969b9ad25e922fb09eaf4b3:/test/format/test-mymbox

diff --git a/test/format/test-mymbox b/test/format/test-mymbox
index 42f584c1..ee5e7270 100755
--- a/test/format/test-mymbox
+++ b/test/format/test-mymbox
@@ -13,12 +13,14 @@ fi
 
 setup_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=`run_prog ${MH_LIBEXEC_DIR}/ap -format '%(me)' 0`
+#### Remove existing Local-Mailbox: profile component, if any.
+grep -v 'Local-Mailbox: ' "$MH" > "$MH".new
+mv -f "$MH".new "$MH"
+
+user=`id -nu`
+set +e
 host=`${MH_OBJ_DIR}/test/getcanon`
+set -e
 
 output=`run_prog ${MH_LIBEXEC_DIR}/ap -format '%(mymbox{text})' "${user}"`
 run_test "echo $output" 1 "Basic user test"
@@ -29,10 +31,7 @@ run_test "${MH_LIBEXEC_DIR}/ap -format %(mymbox{text}) nosuchuser@nosuchhost.bla
 
 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"
+#### Add Local-Mailbox profile component.
 echo "Local-Mailbox: ${myname}" >> "$MH"
 
 run_test "echo \
@@ -40,7 +39,10 @@ run_test "echo \
          1 "Local-Mailbox test"
 
 output=`run_prog ${MH_LIBEXEC_DIR}/ap -format '%(mymbox{text})' "${user}@${host}"`
-run_test "echo $output" 0 "Local-mailbox overriding user@host test"
+run_test "echo $output" 0 "Local-Mailbox overriding user@host test"
+
+#### Test getusername() when there is a Local-Mailbox profile component.
+run_test 'fmttest -raw -format %(me) ""' "${user}"
 
 # Add an Alternate-Mailbox.  This caused ismymbox() to lose the
 # Local-Mailbox, Bug #36635: -nocc me doesn't account for
@@ -51,9 +53,11 @@ run_test "echo \
          1 "Local-Mailbox with Alternate-Mailbox test"
 
 # check getmymbox, without match
+start_test "getmymbox, without match"
 run_test 'fmttest -message -format %(getmymbox{from}) first' ''
 
 # check getmyaddr, without match
+start_test "getmyaddr, without match"
 run_test 'fmttest -message -format %(getmyaddr{from}) first' ''
 
 grep -v 'Alternate-Mailboxes: ' "$MH" > "$MH".new
@@ -63,14 +67,17 @@ Alternate-Mailboxes: test1@example.com
 EOF
 
 # check getmymbox, with match
+start_test "getmymbox, with match"
 run_test 'fmttest -message -format %(getmymbox{from}) first' \
          'Test1 <test1@example.com>'
 
 # check getmyaddr, with match
+start_test "getmyaddr, with match"
 run_test 'fmttest -message -format %(getmyaddr{from}) first' \
          'test1@example.com'
 
 # check getmymbox and getmyaddr, with match of other than first address in
+start_test "getmymbox and getmyaddr, with match of other than first address in"
 #   component
 cat >`mhpath new` <<'EOF'
 From: Test11 <test11@example.com>
@@ -88,4 +95,5 @@ run_test 'fmttest -message -format %(getmymbox{cc}) last' \
 run_test 'fmttest -message -format %(getmyaddr{cc}) last' \
          'test1@example.com'
 
+finish_test
 exit $failed