Fixed a few very minor issues that cppcheck noticed.

[nmh] / test / format / test-mymbox

diff --git a/test/format/test-mymbox b/test/format/test-mymbox
index 39ab4c11012fca3d24013ec91a748def577672c6..f71a3c921a41f5a7615b2302cc5ef2aa80a15b36 100755 (executable)
--- a/test/format/test-mymbox
+++ b/test/format/test-mymbox
@@ -13,13 +13,17 @@ fi
 
 setup_test
 
 
 setup_test
 

-user=${LOGNAME:-`id -un`}
-host=`${MH_OBJ_DIR}/test/getfqdn`
-
-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=`run_prog ${MH_LIB_DIR}/ap -format '%(me)' 0`
+host=`${MH_OBJ_DIR}/test/getcanon`
+
+output=`run_prog ${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${user}"`
+run_test "echo $output" 1 "Basic user test"
+output=`run_prog ${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"
 
 run_test "${MH_LIB_DIR}/ap -format %(mymbox{text}) nosuchuser@nosuchhost.blah" \
          0 "Basic non-matching test"
 


@@ -31,10 +35,19 @@ grep -v 'Local-Mailbox: ' ${MH} > ${MH}.new
 mv -f ${MH}.new ${MH}
 echo "Local-Mailbox: ${myname}" >> ${MH}
 
 mv -f ${MH}.new ${MH}
 echo "Local-Mailbox: ${myname}" >> ${MH}
 

-run_test "echo `${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${myname}"`" \
+run_test "echo \
+         `run_prog ${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${myname}"`" \

          1 "Local-Mailbox test"
 
          1 "Local-Mailbox test"
 

-run_test "${MH_LIB_DIR}/ap -format %(mymbox{text}) ${user}@${host}" \
-         0 "Local-mailbox overriding user@host test"
+output=`run_prog ${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${user}@${host}"`
+run_test "echo $output" 0 "Local-mailbox overriding user@host test"
+
+# Add an Alternate-Mailbox.  This caused ismymbox() to lose the
+# Local-Mailbox, Bug #36635: -nocc me doesn't account for
+# Alternate-Mailboxes.
+printf 'Alternate-Mailboxes: user@example.com\n' >> $MH
+run_test "echo \
+         `run_prog ${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${myname}"`" \
+         1 "Local-Mailbox with Alternate-Mailbox test"

 
 exit $failed
 
 exit $failed