From 425e73e1461b8f7379bf0d5290b3ffaadf2392f9 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 3 Nov 2013 14:24:41 +0200 Subject: [PATCH] test: fix compact backup / restore test It was looking in completely the wrong place for the backup and the (test) xapian database. Unfortunately test_begin_subtest hides the relevant errors. --- test/compact | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/compact b/test/compact index 5bb5cea4..afab5372 100755 --- a/test/compact +++ b/test/compact @@ -19,10 +19,11 @@ thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread) thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag2 unread) thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)" -test_begin_subtest "Restoring backup" -rm -Rf ${TEST_TMPDIR}/mail/xapian -mv ${TEST_TMPDIR}/mail/xapian.old ${TEST_TMPDIR}/mail/xapian +test_expect_success 'Restoring Backup' \ + 'rm -Rf ${MAIL_DIR}/.notmuch/xapian && + mv ${MAIL_DIR}/xapian.old ${MAIL_DIR}/.notmuch/xapian' +test_begin_subtest "Checking restored backup" output=$(notmuch search \* | notmuch_search_sanitize) test_expect_equal "$output" "\ thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)