From 0580e427a0b02829b938ca15fc6cd4a6ba9a3c81 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Sun, 8 Dec 2013 20:59:42 +0200 Subject: [PATCH] Re: [PATCH 2/4] test: sanitize Date and timestamp fields in json --- 74/ed4334fe74b3e3085b0d5e67f1ba1730533396 | 131 ++++++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 74/ed4334fe74b3e3085b0d5e67f1ba1730533396 diff --git a/74/ed4334fe74b3e3085b0d5e67f1ba1730533396 b/74/ed4334fe74b3e3085b0d5e67f1ba1730533396 new file mode 100644 index 000000000..64004dfa6 --- /dev/null +++ b/74/ed4334fe74b3e3085b0d5e67f1ba1730533396 @@ -0,0 +1,131 @@ +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 4B53C431FDC + for ; Sun, 8 Dec 2013 10:59:55 -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 FC-jYlAHNmzS for ; + Sun, 8 Dec 2013 10:59:47 -0800 (PST) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id C957A431FD4 + for ; Sun, 8 Dec 2013 10:59:46 -0800 (PST) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id 69ABC10005D; + Sun, 8 Dec 2013 20:59:42 +0200 (EET) +From: Tomi Ollila +To: David Bremner , notmuch@notmuchmail.org +Subject: Re: [PATCH 2/4] test: sanitize Date and timestamp fields in json +In-Reply-To: <1386517946-22054-3-git-send-email-david@tethera.net> +References: <1386517946-22054-1-git-send-email-david@tethera.net> + <1386517946-22054-3-git-send-email-david@tethera.net> +User-Agent: Notmuch/0.17~rc1+17~ga2e1a2f (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +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 18:59:55 -0000 + +On Sun, Dec 08 2013, David Bremner wrote: + +> 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' \ + +Minor nit: The RE for changing to GENERATED_DATE is more different than +required here and elsewhere in this patch series. Both could use +'Fri, 05 Jan 2001' and '0000' parts... + +> + -e 's|"filename": "/[^"]*",|"filename": "YYYYY",|g' \ +> + -e 's|"timestamp": 97.......|"timestamp": 42|g' +> } +> +> notmuch_emacs_error_sanitize () +> -- +> 1.8.4.3 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2