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

diff --git a/test/format/test-localmbox b/test/format/test-localmbox
index d3c43ef30c8ca2dc0811b46049c8a0aeaa889ce6..9fc662f87fb65f35991df624d8e17425bce28865 100755 (executable)
--- a/test/format/test-localmbox
+++ b/test/format/test-localmbox
@@ -15,6 +15,10 @@ setup_test
 
 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

diff --git a/test/format/test-mymbox b/test/format/test-mymbox
index 5a39d59f61959defbf1211fab885593a4a8d34e7..39ab4c11012fca3d24013ec91a748def577672c6 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>"
 
+#### 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}"`" \