From: David Bremner Date: Tue, 28 Jun 2016 08:24:07 +0000 (+0200) Subject: test: don't use dump and restore in a pipeline X-Git-Tag: 0.22.1_rc0~5 X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=48d33532bb58c2ff61d687011dc0283e3ff536b0;p=notmuch test: don't use dump and restore in a pipeline This has been wrong since bbbdf0478ea, but the race condition was not previously been (often?) triggered in the tests. With the DB_RETRY_LOCK patches, it manifests itself as a deadlock. --- diff --git a/test/T240-dump-restore.sh b/test/T240-dump-restore.sh index e6976ff8..97e9e7f9 100755 --- a/test/T240-dump-restore.sh +++ b/test/T240-dump-restore.sh @@ -135,7 +135,8 @@ test_expect_equal_file EXPECTED OUT test_begin_subtest "format=batch-tag, # round-trip" notmuch dump --format=sup | sort > EXPECTED.$test_count -notmuch dump --format=batch-tag | notmuch restore --format=batch-tag +notmuch dump --format=batch-tag > DUMPFILE +notmuch restore --format=batch-tag < DUMPFILE notmuch dump --format=sup | sort > OUTPUT.$test_count test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count @@ -212,7 +213,8 @@ test_expect_equal_file EXPECTED OUTPUT.$test_count test_begin_subtest 'format=batch-tag, round trip with strange tags' notmuch dump --format=batch-tag > EXPECTED.$test_count -notmuch dump --format=batch-tag | notmuch restore --format=batch-tag +notmuch dump --format=batch-tag > DUMPFILE +notmuch restore --format=batch-tag < DUMPFILE notmuch dump --format=batch-tag > OUTPUT.$test_count test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count