X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Ftests%2Fwhatnow%2Ftest-attach-detach;h=82b25c695276884043b0364a3361f900ae65cc3a;hb=88b2142594d5ea1e8385dae5eca81eed1018c555;hp=1a36d8d60d33c4f07dc4e06ac1674c774532f592;hpb=e98f7f60095bceba1f32e448c421b3e862b728aa;p=mmh

diff --git a/test/tests/whatnow/test-attach-detach b/test/tests/whatnow/test-attach-detach
index 1a36d8d..82b25c6 100644
--- a/test/tests/whatnow/test-attach-detach
+++ b/test/tests/whatnow/test-attach-detach
@@ -12,7 +12,8 @@ cd "$MH_TEST_DIR"
 rm -f "baz's boz"
 touch "baz's boz"
 # whatnow's attach stuff needs a draft to work on
-cp "$MH_TEST_DIR/Mail/inbox/1" "$MH_TEST_DIR/Mail/draft"
+# cp "$MH_TEST_DIR/Mail/inbox/1" "$MH_TEST_DIR/Mail/draft"
+comp +inbox 1 -whatnow true
 
 expectederr=$MH_TEST_DIR/$$.expectederr
 actualerr=$MH_TEST_DIR/$$.actualerr
@@ -23,16 +24,17 @@ rm -f $expected $expectederr $actual $actualerr
 touch $expected $expectederr $actual $actualerr
 
 cat > $expected <<EOF
-baz's boz
+1	/XXX/baz's boz
 EOF
 
 # whatnow's exit status is always 1 so that is not a failure
 set +e
-echo "attach baz\\'s\\ boz" | whatnow -attach foo -noedit -prompt '' 2>> $actualerr >> $actual
-echo "alist" | whatnow -attach foo -noedit -prompt '' 2>> $actualerr >> $actual
-echo "detach baz\\'s\\ boz" | whatnow -attach foo -noedit -prompt '' 2>> $actualerr >> $actual
-echo "alist" | whatnow -attach foo -noedit -prompt '' 2>> $actualerr >> $actual
+echo "attach baz\\'s\\ boz" | whatnow -editor true -prompt '' 2>> $actualerr >> $actual
+echo "alist" | whatnow -editor true -prompt '' 2>> $actualerr >> $actual
+echo "detach 1" | whatnow -editor true -prompt '' 2>> $actualerr >> $actual
+echo "alist" | whatnow -editor true -prompt '' 2>> $actualerr >> $actual
 set -e
 
 diff -u $expectederr $actualerr
-diff -u $expected $actual
+<$actual sed 's,/.*/,/XXX/,' >$actual.clean
+diff -u $expected $actual.clean