debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-01 07:04:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: don't use dump and restore in a pipeline

Browse source 
This has been wrong since bbbdf0478e, 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.
This commit is contained in:
David Bremner 2016-06-28 10:24:07 +02:00
parent 64b0d21da0
commit 48d33532bb
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/T240-dump-restore.sh
View file

@ -135,7 +135,8 @@ test_expect_equal_file EXPECTED OUT
test_begin_subtest "format=batch-tag, # round-trip" test_begin_subtest "format=batch-tag, # round-trip"
notmuch dump --format=sup | sort > EXPECTED.$test_count 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 notmuch dump --format=sup | sort > OUTPUT.$test_count
test_expect_equal_file EXPECTED.$test_count 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' test_begin_subtest 'format=batch-tag, round trip with strange tags'
notmuch dump --format=batch-tag > EXPECTED.$test_count 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 notmuch dump --format=batch-tag > OUTPUT.$test_count
test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count