debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: drop use of db_ending

Browse source 
This will allow the dropping of the test for the default ending from
configure.
This commit is contained in:
David Bremner 2020-07-29 21:01:30 -03:00
parent 29a58ecf4a
commit 99a7aac8f2
5 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/T050-new.sh
View file

@ -341,9 +341,9 @@ notmuch config set new.tags $OLDCONFIG
test_begin_subtest "Xapian exception: read only files" test_begin_subtest "Xapian exception: read only files"
chmod u-w ${MAIL_DIR}/.notmuch/xapian/*.${db_ending} chmod u-w ${MAIL_DIR}/.notmuch/xapian/*.*
output=$(NOTMUCH_NEW --debug 2>&1 | sed 's/: .*$//' ) output=$(NOTMUCH_NEW --debug 2>&1 | sed 's/: .*$//' )
chmod u+w ${MAIL_DIR}/.notmuch/xapian/*.${db_ending} chmod u+w ${MAIL_DIR}/.notmuch/xapian/*.*
test_expect_equal "$output" "A Xapian exception occurred opening database" test_expect_equal "$output" "A Xapian exception occurred opening database"

5
test/T060-count.sh
View file

@ -95,7 +95,8 @@ test_expect_equal_file EXPECTED OUTPUT
backup_database backup_database
test_begin_subtest "error message for database open" test_begin_subtest "error message for database open"
dd if=/dev/zero of="${MAIL_DIR}/.notmuch/xapian/postlist.${db_ending}" count=3 target=(${MAIL_DIR}/.notmuch/xapian/postlist.*)
dd if=/dev/zero of="$target" count=3
notmuch count '*' 2>OUTPUT 1>/dev/null notmuch count '*' 2>OUTPUT 1>/dev/null
output=$(sed 's/^\(A Xapian exception [^:]*\):.*$/\1/' OUTPUT) output=$(sed 's/^\(A Xapian exception [^:]*\):.*$/\1/' OUTPUT)
test_expect_equal "${output}" "A Xapian exception occurred opening database" test_expect_equal "${output}" "A Xapian exception occurred opening database"
@ -107,7 +108,7 @@ set logging file count-files-gdb.log
set logging on set logging on
break count_files break count_files
commands commands
shell cp /dev/null ${MAIL_DIR}/.notmuch/xapian/postlist.${db_ending} shell cp /dev/null ${MAIL_DIR}/.notmuch/xapian/postlist.*
continue continue
end end
run run

4
test/T150-tagging.sh
View file

@ -305,9 +305,9 @@ test_begin_subtest "Tag name beginning with -"
test_expect_code 1 'notmuch tag +- One' test_expect_code 1 'notmuch tag +- One'
test_begin_subtest "Xapian exception: read only files" test_begin_subtest "Xapian exception: read only files"
chmod u-w ${MAIL_DIR}/.notmuch/xapian/*.${db_ending} chmod u-w ${MAIL_DIR}/.notmuch/xapian/*.*
output=$(notmuch tag +something '*' 2>&1 | sed 's/: .*$//' ) output=$(notmuch tag +something '*' 2>&1 | sed 's/: .*$//' )
chmod u+w ${MAIL_DIR}/.notmuch/xapian/*.${db_ending} chmod u+w ${MAIL_DIR}/.notmuch/xapian/*.*
test_expect_equal "$output" "A Xapian exception occurred opening database" test_expect_equal "$output" "A Xapian exception occurred opening database"
test_done test_done

14
test/T560-lib-error.sh
View file

@ -211,8 +211,7 @@ int main (int argc, char** argv)
fprintf (stderr, "error opening database: %d %s\n", stat, msg ? msg : ""); fprintf (stderr, "error opening database: %d %s\n", stat, msg ? msg : "");
exit (1); exit (1);
} }
path = talloc_asprintf (db, "%s/.notmuch/xapian/postlist.${db_ending}", argv[1]); fd = open(argv[2],O_WRONLY|O_TRUNC);
fd = open(path,O_WRONLY|O_TRUNC);
if (fd < 0) { if (fd < 0) {
fprintf (stderr, "error opening %s\n", argv[1]); fprintf (stderr, "error opening %s\n", argv[1]);
exit (1); exit (1);
@ -228,9 +227,10 @@ cat <<'EOF' > c_tail
} }
EOF EOF
POSTLIST_PATH=(${MAIL_DIR}/.notmuch/xapian/postlist.*)
backup_database backup_database
test_begin_subtest "Xapian exception finding message" test_begin_subtest "Xapian exception finding message"
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} ${POSTLIST_PATH}
{ {
notmuch_message_t *message = NULL; notmuch_message_t *message = NULL;
stat = notmuch_database_find_message (db, "id:nonexistent", &message); stat = notmuch_database_find_message (db, "id:nonexistent", &message);
@ -247,7 +247,7 @@ restore_database
backup_database backup_database
test_begin_subtest "Xapian exception getting tags" test_begin_subtest "Xapian exception getting tags"
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} ${POSTLIST_PATH}
{ {
notmuch_tags_t *tags = NULL; notmuch_tags_t *tags = NULL;
tags = notmuch_database_get_all_tags (db); tags = notmuch_database_get_all_tags (db);
@ -265,7 +265,7 @@ restore_database
backup_database backup_database
test_begin_subtest "Xapian exception creating directory" test_begin_subtest "Xapian exception creating directory"
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} ${POSTLIST_PATH}
{ {
notmuch_directory_t *directory = NULL; notmuch_directory_t *directory = NULL;
stat = notmuch_database_get_directory (db, "none/existing", &directory); stat = notmuch_database_get_directory (db, "none/existing", &directory);
@ -282,7 +282,7 @@ restore_database
backup_database backup_database
test_begin_subtest "Xapian exception searching messages" test_begin_subtest "Xapian exception searching messages"
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} ${POSTLIST_PATH}
{ {
notmuch_messages_t *messages = NULL; notmuch_messages_t *messages = NULL;
notmuch_query_t *query=notmuch_query_create (db, "*"); notmuch_query_t *query=notmuch_query_create (db, "*");
@ -301,7 +301,7 @@ restore_database
backup_database backup_database
test_begin_subtest "Xapian exception counting messages" test_begin_subtest "Xapian exception counting messages"
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} ${POSTLIST_PATH}
{ {
int count; int count;
notmuch_query_t *query=notmuch_query_create (db, "id:87ocn0qh6d.fsf@yoom.home.cworth.org"); notmuch_query_t *query=notmuch_query_create (db, "id:87ocn0qh6d.fsf@yoom.home.cworth.org");

11
test/test-lib.sh
View file

@ -1261,17 +1261,6 @@ test -z "$NO_PYTHON" && test_set_prereq PYTHON
ln -s x y 2>/dev/null && test -h y 2>/dev/null && test_set_prereq SYMLINKS ln -s x y 2>/dev/null && test -h y 2>/dev/null && test_set_prereq SYMLINKS
rm -f y rm -f y
# convert variable from configure to more convenient form
case "$NOTMUCH_DEFAULT_XAPIAN_BACKEND" in
glass)
db_ending=glass
;;
chert)
db_ending=DB
;;
*)
error "Unknown Xapian backend $NOTMUCH_DEFAULT_XAPIAN_BACKEND"
esac
# declare prerequisites for external binaries used in tests # declare prerequisites for external binaries used in tests
test_declare_external_prereq dtach test_declare_external_prereq dtach
test_declare_external_prereq emacs test_declare_external_prereq emacs