diff options
| author | David Bremner <david@tethera.net> | 2016-06-28 10:24:07 +0200 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2016-06-29 09:03:14 +0200 |
| commit | 496dccf44fadf4c8ee190e98d3cba54a8e828f97 (patch) | |
| tree | ffdea35fed498f533a0b46f06012774ad34bacf7 | |
| parent | 38f0d44a82d4a6584bd95f611dfb429057a37b62 (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 bbfb09b9..faa10364 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 |