From 0a741eb8f556b6af391a2e3b61f1a53bdfcd37e2 Mon Sep 17 00:00:00 2001 From: Peter Wang Date: Wed, 8 Aug 2012 22:27:49 +1000 Subject: [PATCH] [PATCH v2 0/3] indicate length of omitted body content --- da/80b90db4701661388f93a46f4854a1d36b594f | 88 +++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 da/80b90db4701661388f93a46f4854a1d36b594f diff --git a/da/80b90db4701661388f93a46f4854a1d36b594f b/da/80b90db4701661388f93a46f4854a1d36b594f new file mode 100644 index 000000000..211f65093 --- /dev/null +++ b/da/80b90db4701661388f93a46f4854a1d36b594f @@ -0,0 +1,88 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id B68D7431FAF + for ; Wed, 8 Aug 2012 05:28:13 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.799 +X-Spam-Level: +X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id DyGbtQZGkC0m for ; + Wed, 8 Aug 2012 05:28:13 -0700 (PDT) +Received: from mail-gh0-f181.google.com (mail-gh0-f181.google.com + [209.85.160.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 51402431FAE + for ; Wed, 8 Aug 2012 05:28:13 -0700 (PDT) +Received: by ghz3 with SMTP id 3so879463ghz.26 + for ; Wed, 08 Aug 2012 05:28:11 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer; + bh=oFJ6PNuq3i4CFXLxaj9G1yMT2AeA6ygrouAQL2DP7w4=; + b=qHJTRNDdCNZVDXjhH0QF4LbrKPDtTkoo0STKw3nTEdku2i+qDkKv6BKy45+9tXrwh9 + MMk2jwUJC5lqyFMaxx+UxagU9s+Mi0hQoCUrr8xB7fRoOwOoqkT5N6nFsCH/x4fY8Sr1 + HQPw252EwUAVdLLzFm4mmRvA9G8BE9J0j3YU4LdGKwbd0kpM1QEYBIGfp6gc/hYbrZFc + SWTtIrqDAu9CU3Bg62qiOuIEXvJ+zl/0CDPWK90OiMmsWg/eQ0X+dBsdWBs/sTpOhnaM + 3OyEcBrT2CDkn2W+81l7hdhEsURWZeEt5j7XO1JqwhyUkqIP1JK0nA7eG3tlkRUE8Mh9 + uybw== +Received: by 10.66.74.100 with SMTP id s4mr33401165pav.27.1344428891254; + Wed, 08 Aug 2012 05:28:11 -0700 (PDT) +Received: from localhost (215.42.233.220.static.exetel.com.au. + [220.233.42.215]) + by mx.google.com with ESMTPS id io1sm13306841pbc.67.2012.08.08.05.28.08 + (version=TLSv1/SSLv3 cipher=OTHER); + Wed, 08 Aug 2012 05:28:10 -0700 (PDT) +From: Peter Wang +To: notmuch@notmuchmail.org +Subject: [PATCH v2 0/3] indicate length of omitted body content +Date: Wed, 8 Aug 2012 22:27:49 +1000 +Message-Id: <1344428872-12374-1-git-send-email-novalazy@gmail.com> +X-Mailer: git-send-email 1.7.4.4 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 08 Aug 2012 12:28:13 -0000 + +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 + -- 2.26.2