The first commit is tangentally related. An expected test case output in test/crypto previously had a filename left unnormalised by notmuch_json_show_sanitize because it was not followed by comma. The next commit causes the comma to be present, breaking the expected output. In the 2nd commit, a content-transfer-encoding field was added and comments clarified. In the 3rd commit, the content-length of an encrypted attachment had to be normalised because it varies between runs. Peter Wang (3): test: normalize only message filenames in show json show: indicate length, encoding of omitted body content test: conform to content length, encoding fields devel/schemata | 9 ++++++++- notmuch-show.c | 14 ++++++++++++++ test/crypto | 30 +++++++++++++++++++++--------- test/json | 2 +- test/multipart | 11 ++++++----- test/test-lib.sh | 2 +- 6 files changed, 51 insertions(+), 17 deletions(-) -- 1.7.4.4