diff options
| author | David Bremner <david@tethera.net> | 2016-06-28 10:24:07 +0200 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2016-06-30 17:47:36 +0200 |
| commit | 48d33532bb58c2ff61d687011dc0283e3ff536b0 (patch) | |
| tree | 46e2965a9349aac355b0a3d1e9541a1a96fb761f | |
| parent | 64b0d21da00a2f5fb7a5b0452b11b50607932fc7 (diff) | |
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.
| -rwxr-xr-x | test/T240-dump-restore.sh | 6 |
1 files changed, 4 insertions, 2 deletions
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 |