X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2FT530-upgrade.sh;h=c4c4ac8b64475955b91d07ca188102d3d626c82b;hb=dd8373fb571f93cf3bf824777e00278979ef2e21;hp=67bbf319a1b7b271212fa6e0d7b74794d293ac07;hpb=8413582b6edc859285d68c9f7ad83236788567c0;p=notmuch

diff --git a/test/T530-upgrade.sh b/test/T530-upgrade.sh
index 67bbf319..c4c4ac8b 100755
--- a/test/T530-upgrade.sh
+++ b/test/T530-upgrade.sh
@@ -25,13 +25,21 @@ test_begin_subtest "path: search does not work with old database version"
 output=$(notmuch search path:foo)
 test_expect_equal "$output" ""
 
+test_expect_success 'pre upgrade dump' 'notmuch dump | sort > pre-upgrade-dump'
+
 test_begin_subtest "database upgrade from format version 1"
-output=$(notmuch new)
+output=$(notmuch new | sed -e 's/^Backing up tags to .*$/Backing up tags to FILENAME/')
 test_expect_equal "$output" "\
 Welcome to a new version of notmuch! Your database will now be upgraded.
-Your notmuch database has now been upgraded to database format version 2.
+This process is safe to interrupt.
+Backing up tags to FILENAME
+Your notmuch database has now been upgraded.
 No new mail."
 
+test_begin_subtest "tag backup matches pre-upgrade dump"
+gunzip -c ${MAIL_DIR}/.notmuch/dump-*.gz | sort > backup-dump
+test_expect_equal_file pre-upgrade-dump backup-dump
+
 test_begin_subtest "folder: no longer matches in the middle of path"
 output=$(notmuch search folder:baz)
 test_expect_equal "$output" ""