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

diff --git a/87/7b71c6d20c6bb17adf8b15896f1c33e4c99758 b/87/7b71c6d20c6bb17adf8b15896f1c33e4c99758
new file mode 100644 (file)
index 0000000..0b00e5b
--- /dev/null
+++ b/87/7b71c6d20c6bb17adf8b15896f1c33e4c99758
@@ -0,0 +1,98 @@
+Return-Path: <jrollins@finestructure.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 7C201431FBD\r
+       for <notmuch@notmuchmail.org>; Thu,  2 Feb 2012 09:41:06 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.29\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.29 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3, T_MIME_NO_TEXT=0.01] 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 mxHBNkZt8KAc for <notmuch@notmuchmail.org>;\r
+       Thu,  2 Feb 2012 09:41:06 -0800 (PST)\r
+Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu\r
+       [131.215.239.19])\r
+       by olra.theworths.org (Postfix) with ESMTP id 0A44A431FAE\r
+       for <notmuch@notmuchmail.org>; Thu,  2 Feb 2012 09:41:06 -0800 (PST)\r
+Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
+       by fire-doxen-postvirus (Postfix) with ESMTP id 9FB363280FA;\r
+       Thu,  2 Feb 2012 09:40:52 -0800 (PST)\r
+X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new\r
+Received: from finestructure.net (cpe-76-174-137-84.socal.res.rr.com\r
+       [76.174.137.84]) (Authenticated sender: jrollins)\r
+       by fire-doxen-submit (Postfix) with ESMTP id 5382A3280F3;\r
+       Thu,  2 Feb 2012 09:40:44 -0800 (PST)\r
+Received: by finestructure.net (Postfix, from userid 1000)\r
+       id B9EFA291; Thu,  2 Feb 2012 09:40:43 -0800 (PST)\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] test: make test_expect_equal_file() arguments flexible\r
+In-Reply-To: <1328080794-24670-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+References: <1328080794-24670-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+User-Agent: Notmuch/0.11+128~g6f388fa (http://notmuchmail.org) Emacs/23.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Thu, 02 Feb 2012 09:40:40 -0800\r
+Message-ID: <87aa51qgkn.fsf@servo.finestructure.net>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; boundary="=-=-=";\r
+       micalg=pgp-sha256; protocol="application/pgp-signature"\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: Thu, 02 Feb 2012 17:41:06 -0000\r
+\r
+--=-=-=\r
+\r
+On Wed,  1 Feb 2012 11:19:54 +0400, Dmitry Kurochkin <dmitry.kurochkin@gmail.com> wrote:\r
+> Before the change, test_expect_equal_file() function treated the first\r
+> argument as "actual output file" and the second argument as "expected\r
+> output file".  When the test fails, the files are copied for later\r
+> inspection.  The first files was copied to "$testname.output" and the\r
+> second file to "$testname.expected".  The argument order for\r
+> test_expect_equal_file() is often wrong which results in confusing\r
+> diff output and incorrectly named files.\r
+\r
+After thinking about this some more, I'm taking it all back.  I think\r
+this is a fine solution, since it just goes with whatever name the test\r
+is invoked with.  Since this is usually just OUTPUT and EXPECTED, it\r
+should all be clear, and the diffs should be fine, even if the ordering\r
+is permuted some places.  Sorry about all the chatter.\r
+\r
++1\r
+\r
+jamie.\r
+\r
+--=-=-=\r
+Content-Type: application/pgp-signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v1.4.11 (GNU/Linux)\r
+\r
+iQIcBAEBCAAGBQJPKsqYAAoJEO00zqvie6q8PEcP/ihx7cEc+0bcpUG6Is8n1+GL\r
+44xxyrCZU1oQ/vE5MiZHJB9njQgTDRyaIdNruPnKdx5H6FJ3nKqFByoJLAYSgwIa\r
+NmA3TzdD9N00p0u6+Yt5qiXjn9zopjJ8KkKUr+3sZ3x8qJvsnJyHJaWWFkepz4NU\r
+ob/qeQ8cT2ZArXjIGqmVFgU9peul3vEOK6kaMpRWc639fnn0jNI9xQp4Y/ao2lEJ\r
+0llrPpGtxnoMHvKz/oTZOJ9jmhoBPwynmWgHcltnawQm5mQfQtOqGSwMX3Tq0eh6\r
+OERcir+fFlmJyzLnWzSyyck77cvD8lWdxlEfFir9hrEGOxHoGNMCL6OLrQ8dBJc+\r
+02aY9/pun9Oe5d34OAGHw9A85+hF14lYXG6MRYSRjp2Ox10Z2u1gLF2qY766uFGn\r
+wH6DZdqF87sm1NmCz9PuJCc3Osi2iiwKWZFA+hAf0lCtsb3YNvbixKwHIbfletXB\r
+aUD17WeunOytjW4vB1Pztk7l/2W9/33oZacRJLQAQmRC8jX0dYSBtsmUgE7reIbV\r
+de8U1Ke2JBr4mwyZDOoRBtwXiMwLFa1GQd09h/BdfBu9pFul29+P54l2mtTQimte\r
+zejc0dux8CJ+q4pENDRy0CsJvHc9mx30NW5dPD1dSRbbblegtYmvbkHjBorVOCFw\r
+TWKtxGMfnVifjvS1yBqi\r
+=gS+h\r
+-----END PGP SIGNATURE-----\r
+--=-=-=--\r