aboutsummaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
authorGravatar David Bremner <bremner@debian.org>2012-12-26 15:36:33 -0400
committerGravatar David Bremner <bremner@debian.org>2013-01-06 10:04:19 -0400
commitd705a6a45bf691b60101203bd09a459be255dceb (patch)
tree8b6cdece4639058e6151cfefa62470ed942865b7 /test
parent4dea9bb442f18081347708bc5446db505441fbba (diff)
notmuch-restore: handle empty input file, leading blank lines and comments.
This patch corrects several undesirable behaviours: 1) Empty files were not detected, leading to buffer read overrun. 2) An initial blank line cause restore to silently abort 3) Initial comment line caused format detection to fail
Diffstat (limited to 'test')
-rwxr-xr-xtest/dump-restore3
1 files changed, 0 insertions, 3 deletions
diff --git a/test/dump-restore b/test/dump-restore
index c2ddb921..ae30cd10 100755
--- a/test/dump-restore
+++ b/test/dump-restore
@@ -146,13 +146,11 @@ cat <<EOF > comments-and-blanks
EOF
test_begin_subtest 'restoring empty file is not an error'
-test_subtest_known_broken
notmuch restore < /dev/null 2>OUTPUT.$test_count
cp /dev/null EXPECTED
test_expect_equal_file EXPECTED OUTPUT.$test_count
test_begin_subtest 'file of comments and blank lines is not an error'
-test_subtest_known_broken
notmuch restore --input=comments-and-blanks
ret_val=$?
test_expect_equal "$ret_val" "0"
@@ -172,7 +170,6 @@ echo "yun1vjwegii.fsf@aiko.keithp.com (another_tag)" \
>> leading-comments-blanks-sup
test_begin_subtest 'detect format=sup with leading comments and blanks'
-test_subtest_known_broken
notmuch restore --input=leading-comments-blanks-sup
notmuch search --output=tags id:yun1vjwegii.fsf@aiko.keithp.com > OUTPUT.$test_count
echo "another_tag" > EXPECTED