From: Peter Feigl Date: Tue, 4 Dec 2012 13:46:45 +0000 (+0100) Subject: [PATCH 1/1] Fixing failing JSON tests. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ac3ad247aebcb941fb974d47ca170ee528653ff3;p=notmuch-archives.git [PATCH 1/1] Fixing failing JSON tests. --- diff --git a/50/8b6c01c11e31097bb88af613a53d6d8a248f31 b/50/8b6c01c11e31097bb88af613a53d6d8a248f31 new file mode 100644 index 000000000..cf0c70992 --- /dev/null +++ b/50/8b6c01c11e31097bb88af613a53d6d8a248f31 @@ -0,0 +1,85 @@ +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 B6FD1431FB6 + for ; Tue, 4 Dec 2012 05:46:58 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.001 +X-Spam-Level: +X-Spam-Status: No, score=0.001 tagged_above=-999 required=5 + tests=[FREEMAIL_FROM=0.001] 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 iV3MG3RbvVzd for ; + Tue, 4 Dec 2012 05:46:54 -0800 (PST) +Received: from mail.nexoid.at (www.nexoid.at [178.79.130.240]) + (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 7E505431FAE + for ; Tue, 4 Dec 2012 05:46:54 -0800 (PST) +Received: by mail.nexoid.at (Postfix, from userid 1000) + id 6F4AA11C109; Tue, 4 Dec 2012 14:46:51 +0100 (CET) +From: Peter Feigl +To: notmuch@notmuchmail.org +Subject: =?UTF-8?q?=5BPATCH=201/1=5D=20Fixing=20failing=20JSON=20tests=2E?= +Date: Tue, 4 Dec 2012 14:46:45 +0100 +Message-Id: <1354628805-2148-1-git-send-email-craven@gmx.net> +X-Mailer: git-send-email 1.8.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +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: Tue, 04 Dec 2012 13:46:58 -0000 + +Two --format=json tests were failing, both due changes in the output +format introduced by the structured formatting code. This patch updates +the expected output. +--- + test/json | 12 ++---------- + 1 file changed, 2 insertions(+), 10 deletions(-) + +diff --git a/test/json b/test/json +index bfafd55..75b732f 100755 +--- a/test/json ++++ b/test/json +@@ -32,7 +32,7 @@ test_expect_equal_json "$output" "[{\"thread\": \"XXX\", + test_begin_subtest "Show message: json, utf-8" + add_message "[subject]=\"json-show-utf8-body-sübjéct\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"jsön-show-méssage\"" + output=$(notmuch show --format=json "jsön-show-méssage") +-test_expect_equal_json "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-utf8-body-sübjéct\", \"From\": \"Notmuch Test Suite \", \"To\": \"Notmuch Test Suite \", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"jsön-show-méssage\n\"}]}, []]]]" ++test_expect_equal_json "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\", \"unread\"], \"headers\": {\"Subject\": \"json-show-utf8-body-sübjéct\", \"From\": \"Notmuch Test Suite \", \"To\": \"Notmuch Test Suite \", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"jsön-show-méssage\n\"}]}, []]]]" + + test_begin_subtest "Show message: json, inline attachment filename" + subject='json-show-inline-attachment-filename' +@@ -50,14 +50,6 @@ test_expect_equal_json "$output" "[[[{\"id\": \"$id\", \"match\": true, \"exclud + test_begin_subtest "Search message: json, utf-8" + add_message "[subject]=\"json-search-utf8-body-sübjéct\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"jsön-search-méssage\"" + output=$(notmuch search --format=json "jsön-search-méssage" | notmuch_search_sanitize) +-test_expect_equal_json "$output" "[{\"thread\": \"XXX\", +- \"timestamp\": 946728000, +- \"date_relative\": \"2000-01-01\", +- \"matched\": 1, +- \"total\": 1, +- \"authors\": \"Notmuch Test Suite\", +- \"subject\": \"json-search-utf8-body-sübjéct\", +- \"tags\": [\"inbox\", +- \"unread\"]}]" ++test_expect_equal_json "$output" "[{\"thread\": \"XXX\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"matched\": 1, \"total\": 1, \"authors\": \"Notmuch Test Suite\", \"subject\": \"json-search-utf8-body-sübjéct\", \"tags\": [\"inbox\", \"unread\"]}]" + + test_done +-- +1.8.0 +