lib/message: catch exception in n_m_get_thread_id

[notmuch] / test / T240-dump-restore.sh

diff --git a/test/T240-dump-restore.sh b/test/T240-dump-restore.sh
index f626a19e4b1ad931f475645984656e25dbdc0f9b..0870ff921f1e1642359fe088fff7f0e9ef8a3e63 100755 (executable)
--- a/test/T240-dump-restore.sh
+++ b/test/T240-dump-restore.sh
@@ -1,12 +1,11 @@
 #!/usr/bin/env bash
 test_description="\"notmuch dump\" and \"notmuch restore\""
-. ./test-lib.sh || exit 1
+. $(dirname "$0")/test-lib.sh || exit 1
 
 NOTMUCH_NEW > /dev/null
 test_begin_subtest "dump header"
-test_subtest_known_broken
 cat <<EOF > EXPECTED
-#notmuch-dump batch-tag:2 config,properties,tags
+#notmuch-dump batch-tag:3 config,properties,tags
 EOF
 notmuch dump > OUTPUT
 test_expect_equal_file EXPECTED OUTPUT
@@ -130,7 +129,7 @@ test_begin_subtest "Check for a safe set of message-ids"
 notmuch search --output=messages from:cworth | sed s/^id:// > EXPECTED
 notmuch search --output=messages from:cworth | sed s/^id:// |\
        $TEST_DIRECTORY/hex-xcode --direction=encode > OUTPUT
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "format=batch-tag, dump sanity check."
 NOTMUCH_DUMP_TAGS --format=sup from:cworth | cut -f1 -d' ' | \