From b8f6dbbcb62490623e94f59dc731cf255975654a Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 8 Dec 2013 23:52:24 +0800 Subject: [PATCH] [PATCH 2/4] test: sanitize Date and timestamp fields in json --- 36/0941f80c173ce281ac257115d897a05d60abc2 | 117 ++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 36/0941f80c173ce281ac257115d897a05d60abc2 diff --git a/36/0941f80c173ce281ac257115d897a05d60abc2 b/36/0941f80c173ce281ac257115d897a05d60abc2 new file mode 100644 index 000000000..4e2e80562 --- /dev/null +++ b/36/0941f80c173ce281ac257115d897a05d60abc2 @@ -0,0 +1,117 @@ +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 1CF42431E82 + for ; Sun, 8 Dec 2013 07:52:57 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 GZ4Rn0sg1t62 for ; + Sun, 8 Dec 2013 07:52:49 -0800 (PST) +Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 42953431FDA + for ; Sun, 8 Dec 2013 07:52:49 -0800 (PST) +Received: from remotemail by yantan.tethera.net with local (Exim 4.80) + (envelope-from ) + id 1Vpgf1-0006AE-8s; Sun, 08 Dec 2013 11:52:47 -0400 +Received: (nullmailer pid 22780 invoked by uid 1000); Sun, 08 Dec 2013 + 15:52:31 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [PATCH 2/4] test: sanitize Date and timestamp fields in json +Date: Sun, 8 Dec 2013 23:52:24 +0800 +Message-Id: <1386517946-22054-3-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.8.4.3 +In-Reply-To: <1386517946-22054-1-git-send-email-david@tethera.net> +References: <1386517946-22054-1-git-send-email-david@tethera.net> +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: Sun, 08 Dec 2013 15:52:57 -0000 + +Eventually we want test messages to have distinct dates to avoid +reproducability problems. This sanitization will prevent some test +failures when that change is made. + +Replace the use of a local function in maildir-sync with +notmuch_json_show_sanitize +--- + test/maildir-sync | 15 +++++---------- + test/test-lib.sh | 4 +++- + 2 files changed, 8 insertions(+), 11 deletions(-) + +diff --git a/test/maildir-sync b/test/maildir-sync +index 33d2c58..3186e70 100755 +--- a/test/maildir-sync ++++ b/test/maildir-sync +@@ -4,11 +4,6 @@ test_description="maildir synchronization" + + . ./test-lib.sh + +-# Avoid including the local value of MAIL_DIR in the result. +-filter_show_json() { +- sed -e "s|${MAIL_DIR}/|MAIL_DIR/|" +-} +- + # Create the expected maildir structure + mkdir $MAIL_DIR/cur + mkdir $MAIL_DIR/new +@@ -40,18 +35,18 @@ output=$(cd ${MAIL_DIR}/cur; ls -1 adding-replied*) + test_expect_equal "$output" "adding-replied-tag:2,RS" + + test_begin_subtest "notmuch show works with renamed file (without notmuch new)" +-output=$(notmuch show --format=json id:${gen_msg_id} | filter_show_json) +-test_expect_equal_json "$output" '[[[{"id": "adding-replied-tag@notmuch-test-suite", ++output=$(notmuch show --format=json id:${gen_msg_id} | notmuch_json_show_sanitize) ++test_expect_equal_json "$output" '[[[{"id": "XXXXX", + "match": true, + "excluded": false, +-"filename": "MAIL_DIR/cur/adding-replied-tag:2,RS", +-"timestamp": 978709437, ++"filename": "YYYYY", ++"timestamp": 42, + "date_relative": "2001-01-05", + "tags": ["inbox","replied"], + "headers": {"Subject": "Adding replied tag", + "From": "Notmuch Test Suite ", + "To": "Notmuch Test Suite ", +-"Date": "Fri, 05 Jan 2001 15:43:57 +0000"}, ++"Date": "GENERATED_DATE"}, + "body": [{"id": 1, + "content-type": "text/plain", + "content": "This is just a test message (#3)\n"}]}, +diff --git a/test/test-lib.sh b/test/test-lib.sh +index 8611ba5..9d2f805 100644 +--- a/test/test-lib.sh ++++ b/test/test-lib.sh +@@ -625,7 +625,9 @@ notmuch_json_show_sanitize () + { + sed \ + -e 's|"id": "[^"]*",|"id": "XXXXX",|g' \ +- -e 's|"filename": "/[^"]*",|"filename": "YYYYY",|g' ++ -e 's|"Date": "Fri[^"]*0000"|"Date": "GENERATED_DATE"|g' \ ++ -e 's|"filename": "/[^"]*",|"filename": "YYYYY",|g' \ ++ -e 's|"timestamp": 97.......|"timestamp": 42|g' + } + + notmuch_emacs_error_sanitize () +-- +1.8.4.3 + -- 2.26.2