From cf8aabdd3759519ad8c56852fe03908b1b09bc03 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Tue, 28 Jun 2016 23:08:54 +0200 Subject: [PATCH 1/6] test: make gdb even quieter gdb sometimes writes warnings to stdout, which we don't need/want, and for some reason --batch-silent isn't enough to hide. So in this commit we write them to a log file, which is probably better for debugging anyway. To see an illustrative test failure before this change, run % make % touch notmuch-count.c % cd test && ./T060-count.sh (cherry picked from commit f45fa5bdd397d52473f7092f7ae3e2ffb9b7aee5) --- test/T060-count.sh | 2 ++ test/T070-insert.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/test/T060-count.sh b/test/T060-count.sh index 0ac83140..d6933a76 100755 --- a/test/T060-count.sh +++ b/test/T060-count.sh @@ -103,6 +103,8 @@ restore_database cat < count-files.gdb set breakpoint pending on +set logging file count-files-gdb.log +set logging on break count_files commands shell cp /dev/null ${MAIL_DIR}/.notmuch/xapian/postlist.${db_ending} diff --git a/test/T070-insert.sh b/test/T070-insert.sh index e7ec6a6c..c2485bb2 100755 --- a/test/T070-insert.sh +++ b/test/T070-insert.sh @@ -192,6 +192,8 @@ for code in OUT_OF_MEMORY XAPIAN_EXCEPTION FILE_NOT_EMAIL \ gen_insert_msg cat < index-file-$code.gdb set breakpoint pending on +set logging file index-file-$code.log +set logging on break notmuch_database_add_message commands return NOTMUCH_STATUS_$code From 98da3c079a6b42fa36663e7ecae0c8e6f0e01b8f Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 14 Aug 2016 13:31:25 +0900 Subject: [PATCH 2/6] debian: changelog stanza for 0.22.1-3 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index bac4fcb9..1a7150d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +notmuch (0.22.1-3) unstable; urgency=medium + + * Gag gdb even more. Bug fix: "FTBFS in testing", thanks to Santiago + Vila (Closes: #834271). + + -- David Bremner Sun, 14 Aug 2016 13:31:13 +0900 + notmuch (0.22.1-2) unstable; urgency=medium * Add explicit build-depends on gnupg, for the test suite. From 7edded2740603eb9cde84f2c7b421026fbac3640 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 8 Sep 2016 09:03:15 -0300 Subject: [PATCH 3/6] test/crypto: hard code fingerprint Originally the intent was to make the test more robust against changing test keys. It turns out that (unscientifically) gpg --with-colons output changes more often than our test key. Rather than making the script more complex, just hard code the fingerprint. This fixes Debian bug #847013; I expect similar test failures as other distros adopt gnupg 2.1.15 --- test/T350-crypto.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/T350-crypto.sh b/test/T350-crypto.sh index 3656cce9..96349fa0 100755 --- a/test/T350-crypto.sh +++ b/test/T350-crypto.sh @@ -25,8 +25,8 @@ add_gnupg_home () ################################################## add_gnupg_home -# get key fingerprint -FINGERPRINT=$(gpg --no-tty --list-secret-keys --with-colons --fingerprint | grep '^fpr:' | cut -d: -f10) +# Change this if we ship a new test key +FINGERPRINT="5AEAB11F5E33DCE875DDB75B6D92612D94E46381" test_expect_success 'emacs delivery of signed message' \ 'emacs_fcc_message \ From afef67679378cde97153f262336880ffe14d7aed Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 8 Sep 2016 19:05:12 -0300 Subject: [PATCH 4/6] version: bump to 0.22.2 --- bindings/python/notmuch/version.py | 2 +- version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py index 0dcbb4e3..6d2b25fd 100644 --- a/bindings/python/notmuch/version.py +++ b/bindings/python/notmuch/version.py @@ -1,3 +1,3 @@ # this file should be kept in sync with ../../../version -__VERSION__ = '0.22.1' +__VERSION__ = '0.22.2' SOVERSION = '4' diff --git a/version b/version index a723ece7..faa5fb26 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.22.1 +0.22.2 From 79b3dda3f38ce95f6b3819df75c8ea6ea8c88994 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 8 Sep 2016 19:11:26 -0300 Subject: [PATCH 5/6] debian: add changelog stanza for 0.22.2-1 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1a7150d0..fb82015d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +notmuch (0.22.2-1) unstable; urgency=medium + + * Fix test suite compatibility with GnuPG 2.1.15. Bug fix: "FTBFS: + Tests failures", thanks to Lucas Nussbaum (Closes: #837013). + + -- David Bremner Thu, 08 Sep 2016 19:09:53 -0300 + notmuch (0.22.1-3) unstable; urgency=medium * Gag gdb even more. Bug fix: "FTBFS in testing", thanks to Santiago From da5029e2ac8dfd8a839de1f6a4701237d0b34db1 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 8 Sep 2016 19:22:12 -0300 Subject: [PATCH 6/6] NEWS: add news for 0.22.2 --- NEWS | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/NEWS b/NEWS index 3db6aba9..31d94274 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,18 @@ +Notmuch 0.22.2 (2016-09-08) +=========================== + +Test Suite +---------- + +Silence gdb more + + Have gdb write to a log file instead of stdout, hiding some more + (harmless) stderr chatter which causes test failures. + +Hardcode fingerprint in PGP/MIME tests + + Make the tests more robust against changing GnuPG output formats. + Notmuch 0.22.1 (2016-07-19) ===========================