X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fmhstore%2Ftest-mhstore;h=3dde1ca45a18430b0ff097746d7b955cecc20216;hb=0ecdc197e9a9a4d2bb6dce395dea152fbc728b6b;hp=421580b26998062a2d3d9bb7738b9d04a5958f6d;hpb=207d657cf4495be3eb44ccde94e807692665f5e2;p=mmh

diff --git a/test/mhstore/test-mhstore b/test/mhstore/test-mhstore
index 421580b..3dde1ca 100755
--- a/test/mhstore/test-mhstore
+++ b/test/mhstore/test-mhstore
@@ -239,6 +239,9 @@ EOF
 run_test 'mhstore last' 'storing message 15 as file 15.txt'
 check $expected 15.txt
 
+# cd into Mail directory because it gets cleaned up by the exit trap.
+cd Mail
+
 # check -clobber always
 folder +inbox 7 > /dev/null
 touch 7.txt
@@ -247,7 +250,8 @@ This is message number 7
 EOF
 run_test 'mhstore' 'storing message 7 as file 7.txt'
 check $expected 7.txt 'keep first'
-run_test 'mhstore -clobber always' 'storing message 7 as file 7.txt'
+run_test 'mhstore -clobber ask -clobber always' \
+         'storing message 7 as file 7.txt'
 check $expected 7.txt 'keep first'
 
 # check -clobber auto
@@ -276,7 +280,7 @@ mhstore -clobber never >/dev/null 2>&1
 run_test "echo $?" 1
 set -e
 
-/bin/rm -f 7.txt 7-1.txt 7.txt.1
+cd ..
 
 # check with relative nmh-storage profile component
 storagedir=storagedir