Remove any existing Local-Mailbox: profile component before adding one.

diff --git a/test/format/test-localmbox b/test/format/test-localmbox
index d3c43ef..9fc662f 100755 (executable)
--- a/test/format/test-localmbox
+++ b/test/format/test-localmbox
@@ -15,6 +15,10 @@ setup_test
 
 testname="Some User <some@domain.com>"
 
 
 testname="Some User <some@domain.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: ${testname}" >> ${MH}
 
 # We can use "ap" to get the output of format commands
 echo "Local-Mailbox: ${testname}" >> ${MH}
 
 # We can use "ap" to get the output of format commands

diff --git a/test/format/test-mymbox b/test/format/test-mymbox
index 5a39d59..39ab4c1 100755 (executable)
--- a/test/format/test-mymbox
+++ b/test/format/test-mymbox
@@ -25,6 +25,10 @@ run_test "${MH_LIB_DIR}/ap -format %(mymbox{text}) nosuchuser@nosuchhost.blah" \
 
 myname="Random User <random@user.something.com>"
 
 
 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}"`" \
 echo "Local-Mailbox: ${myname}" >> ${MH}
 
 run_test "echo `${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${myname}"`" \