[Patch v6 01/14] test: add utility function to sort a json list

diff --git a/af/ca626e078afca253a7c8b4dcf2b9466f84e353 b/af/ca626e078afca253a7c8b4dcf2b9466f84e353
new file mode 100644 (file)
index 0000000..97e8596
--- /dev/null
+++ b/af/ca626e078afca253a7c8b4dcf2b9466f84e353
@@ -0,0 +1,73 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id E54B2429E32\r
+       for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 16:02:24 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 1dqfFKu1Xk5O for <notmuch@notmuchmail.org>;\r
+       Tue, 11 Mar 2014 16:02:24 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 7D9F5431FDA\r
+       for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 16:02:07 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1WNVgV-0001ur-4v; Tue, 11 Mar 2014 20:02:07 -0300\r
+Received: (nullmailer pid 25839 invoked by uid 1000); Tue, 11 Mar 2014\r
+       23:01:45 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v6 01/14] test: add utility function to sort a json list\r
+Date: Tue, 11 Mar 2014 20:01:27 -0300\r
+Message-Id: <1394578900-25618-2-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.5.3\r
+In-Reply-To: <1394578900-25618-1-git-send-email-david@tethera.net>\r
+References: <1394578900-25618-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 11 Mar 2014 23:02:25 -0000\r
+\r
+So far we only need this one place, but it's a bit messy to inline\r
+---\r
+ test/test-lib.sh | 6 ++++++\r
+ 1 file changed, 6 insertions(+)\r
+\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index 66edb7c..9824bb6 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -622,6 +622,12 @@ test_expect_equal_json () {\r
+     test_expect_equal "$output" "$expected" "$@"\r
+ }\r
+ \r
++# Sort the top-level list of JSON data from stdin.\r
++test_sort_json () {\r
++    PYTHONIOENCODING=utf-8 python -c \\r
++        "import sys, json; json.dump(sorted(json.load(sys.stdin)),sys.stdout)"\r
++}\r
++\r
+ test_emacs_expect_t () {\r
+       test "$#" = 2 && { prereq=$1; shift; } || prereq=\r
+       test "$#" = 1 ||\r
+-- \r
+1.8.5.3\r
+\r