X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Ft0006-dump-restore.sh;h=21f91055386f280e0c58545de5c04bb4c9f9c4bd;hp=f971181e649c6b1ee24d2ee2874e0987e10bbd2c;hb=51cd69feb1d131db7a468e33e0fa2e043caad41e;hpb=5398e6966a80e1aaad111e1fc0c61d0aa199a229

diff --git a/test/t0006-dump-restore.sh b/test/t0006-dump-restore.sh
index f971181e..21f91055 100755
--- a/test/t0006-dump-restore.sh
+++ b/test/t0006-dump-restore.sh
@@ -1,30 +1,22 @@
 #!/bin/bash
 test_description="\"notmuch dump\" and \"notmuch restore\""
 . ./test-lib.sh
-test_expect_success 'Generate some message' '
-generate_message &&
-notmuch new
-'
-test_expect_success "Dumping all tags" '
-$NOTMUCH dump dump.expected &&
-pass_if_equal "$?" "0"
 
-'
-test_expect_success "Clearing all tags" '
+test_expect_success "Dumping all tags" "generate_message &&
+notmuch new &&
+$NOTMUCH dump dump.expected"
+
+test_begin_subtest "Clearing all tags"
 sed -e "s/(\([^(]*\))$/()/" < dump.expected > clear.expected
-$NOTMUCH restore clear.expected &&
-$NOTMUCH dump clear.actual &&
-pass_if_equal "$(< clear.actual)" "$(< clear.expected)"
+$NOTMUCH restore clear.expected 
+$NOTMUCH dump clear.actual
+test_expect_equal "$(< clear.actual)" "$(< clear.expected)"
+
+test_begin_subtest "Restoring original tags"
+$NOTMUCH restore dump.expected
+$NOTMUCH dump dump.actual
+test_expect_equal "$(< dump.actual)" "$(< dump.expected)"
 
-'
-test_expect_success "Restoring original tags" '
-$NOTMUCH restore dump.expected &&
-$NOTMUCH dump dump.actual &&
-pass_if_equal "$(< dump.actual)" "$(< dump.expected)"
+test_expect_success "Restore with nothing to do" "$NOTMUCH restore dump.expected"
 
-'
-test_expect_success "Restore with nothing to do" '
-$NOTMUCH restore dump.expected &&
-pass_if_equal "$?" "0"
-'
 test_done