Re: [PATCH] test: make test_expect_equal_file() arguments flexible

diff --git a/26/c6b60f7dca432abe9a87d7d6113eee07c09756 b/26/c6b60f7dca432abe9a87d7d6113eee07c09756
new file mode 100644 (file)
index 0000000..d7e7f3b
--- /dev/null
+++ b/26/c6b60f7dca432abe9a87d7d6113eee07c09756
@@ -0,0 +1,96 @@
+Return-Path: <dmitry.kurochkin@gmail.com>\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 23368431E64\r
+       for <notmuch@notmuchmail.org>; Wed,  1 Feb 2012 01:24:35 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 fbDMnvyht7IF for <notmuch@notmuchmail.org>;\r
+       Wed,  1 Feb 2012 01:24:34 -0800 (PST)\r
+Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com\r
+       [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 61FE1431FAF\r
+       for <notmuch@notmuchmail.org>; Wed,  1 Feb 2012 01:24:34 -0800 (PST)\r
+Received: by bke11 with SMTP id 11so904577bke.26\r
+       for <notmuch@notmuchmail.org>; Wed, 01 Feb 2012 01:24:33 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=from:to:subject:in-reply-to:references:user-agent:date:message-id\r
+       :mime-version:content-type;\r
+       bh=NQZ8wf6habitkxauYKQb4H/MG/3o418apUz6rqtRj6Q=;\r
+       b=b5Ilvd23cFwKsvyEqlBMJ2wGr2U6ADyoAQyYLruElMos6i90ag4moaeA3SG+ub/wRP\r
+       IJjmPgmE+zl36jXQEINMkwfIUL0+IiL1hhBNz4mf785FbAS7flynEKCAKJX7ZodPHF5r\r
+       a9kOaTSVBthGCPygMDzBG9fpgzhGx8dU0f+kg=\r
+Received: by 10.204.143.131 with SMTP id v3mr12630437bku.83.1328088272966;\r
+       Wed, 01 Feb 2012 01:24:32 -0800 (PST)\r
+Received: from localhost ([91.144.186.21])\r
+       by mx.google.com with ESMTPS id bw9sm52575167bkb.8.2012.02.01.01.24.31\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 01 Feb 2012 01:24:32 -0800 (PST)\r
+From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>,\r
+       Jameson Graef Rollins <jrollins@finestructure.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] test: make test_expect_equal_file() arguments flexible\r
+In-Reply-To: <m28vknaq5l.fsf@guru.guru-group.fi>\r
+References: <1328080794-24670-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+       <87r4yfszx9.fsf@servo.finestructure.net>\r
+       <m28vknaq5l.fsf@guru.guru-group.fi>\r
+User-Agent: Notmuch/0.11+139~gd9b7cab (http://notmuchmail.org) Emacs/23.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Wed, 01 Feb 2012 13:23:19 +0400\r
+Message-ID: <87mx92nbzs.fsf@gmail.com>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\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: Wed, 01 Feb 2012 09:24:35 -0000\r
+\r
+On Wed, 01 Feb 2012 10:55:50 +0200, Tomi Ollila <tomi.ollila@iki.fi> wrote:\r
+> On Wed, 01 Feb 2012 00:47:30 -0800, Jameson Graef Rollins <jrollins@finestructure.net> wrote:\r
+> > On Wed,  1 Feb 2012 11:19:54 +0400, Dmitry Kurochkin <dmitry.kurochkin@gmail.com> wrote:\r
+> > > The down side of this approach is that diff argument order depends on\r
+> > > test_expect_equal_file() argument order.  So sometimes we get diff\r
+> > > from expected to actual results, and sometimes the other way around.\r
+> > > But the files are always named correctly.\r
+> > \r
+> > Actually, I think this last point is the most important thing to retain.\r
+> > Consistency in the diffs makes reading test results much more efficient.\r
+> > The order I don't much care about.  But seeing as we have been\r
+> > consistent with a particular order for a while, it seems like more\r
+> > effort than it's worth to change it.\r
+> \r
+> how about enforcing it in the test suite ?\r
+> \r
+> case $file2 in \r
+>      *.expected|*.EXPECTED) ;; \r
+>         *) echo "$file2" does not end with 'expected' >&2; exit 1\r
+> esac\r
+> \r
+\r
+It would break some existing tests.  But I like it.\r
+\r
+Regards,\r
+  Dmitry\r
+\r
+> > \r
+> > jamie.\r
+> \r
+> Tomi\r