Merge branch 'release'

Conflicts:
	NEWS

Conflicts resolved by inserting the 0.10.2 stanza before 0.11

2 files changed, 20 insertions, 0 deletions

diff --git a/test/notmuch-test b/test/notmuch-test
index ba28ff39..53ce355c 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -47,6 +47,7 @@ TESTS="
   symbol-hiding
   search-folder-coherence
   atomicity
+  python
 "
 TESTS=${NOTMUCH_TESTS:=$TESTS}
 
diff --git a/test/python b/test/python
new file mode 100755
index 00000000..f737749f
--- /dev/null
+++ b/test/python
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+test_description="python bindings"
+. ./test-lib.sh
+
+add_email_corpus
+
+test_begin_subtest "compare thread ids"
+LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib \
+PYTHONPATH=$TEST_DIRECTORY/../bindings/python \
+python <<EOF | sort > OUTPUT
+import notmuch
+db = notmuch.Database(mode=notmuch.Database.MODE.READ_WRITE)
+q_new = notmuch.Query(db, 'tag:inbox')
+for t in q_new.search_threads():
+    print t.get_thread_id()
+EOF
+notmuch search --output=threads tag:inbox | sed s/^thread:// | sort > EXPECTED
+test_expect_equal_file OUTPUT EXPECTED
+test_done