Re: [PATCH v2 3/5] test: fix hook-counter to accept the new no-display param
authorMichal Nazarewicz <mina86@mina86.com>
Mon, 3 Sep 2012 12:15:43 +0000 (14:15 +0200)
committerW. Trevor King <wking@tremily.us>
Fri, 7 Nov 2014 17:49:20 +0000 (09:49 -0800)
02/33da54ac84a87144ae5d223c3b6540473877d7 [new file with mode: 0644]

diff --git a/02/33da54ac84a87144ae5d223c3b6540473877d7 b/02/33da54ac84a87144ae5d223c3b6540473877d7
new file mode 100644 (file)
index 0000000..8703a25
--- /dev/null
@@ -0,0 +1,161 @@
+Return-Path: <mpn@google.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 DDD20431FB6\r
+       for <notmuch@notmuchmail.org>; Mon,  3 Sep 2012 05:16:10 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7]\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 66aCItPnRVEk for <notmuch@notmuchmail.org>;\r
+       Mon,  3 Sep 2012 05:16:08 -0700 (PDT)\r
+Received: from mail-ee0-f53.google.com (mail-ee0-f53.google.com\r
+ [74.125.83.53])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 49A0D431FAF   for <notmuch@notmuchmail.org>; Mon,  3 Sep 2012 05:16:08 -0700\r
+ (PDT)\r
+Received: by eekb47 with SMTP id b47so2246588eek.26\r
+       for <notmuch@notmuchmail.org>; Mon, 03 Sep 2012 05:16:07 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;\r
+ s=20120113;   h=sender:from:to:subject:in-reply-to:organization:references\r
+       :user-agent:x-face:face:x-pgp:x-pgp-fp:date:message-id:mime-version\r
+       :content-type; bh=jboddLQPybnpqrd5wbau54sqAi5qCp+4xkZNJxhf01E=;\r
+       b=DCJ6nOGlbqiY4M9vYtnnG0n277O8YCqafxRAQ1O+i1bRlD0HuclLp53U+wwnDJHQvn\r
+       YfvsZms81UnId/sksL6eh3pdwjTbmFrsio639C8S2YPFu3nLpi0GYjzdghvlelqKQE1H\r
+       XJs+giungNwTPZZbQbC+miRoZSbbUltxOzOlZzm1YKjlgc5Vk/VH+F68zwLBFDVCRxXM\r
+       2ady//BYQYQIWffWd+oVsiEX1a01HQagfg2jdWicmxKAAua7TjAuwe6wHPOwnhfaBEbc\r
+       6akj/nRx9WaGW6Og4sJwdbLj+svbQkbOHeoRAgLSsRSzz1ZCBTVMkDJs6bBgMv1lzIIK    dVbQ==\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=sender:from:to:subject:in-reply-to:organization:references\r
+       :user-agent:x-face:face:x-pgp:x-pgp-fp:date:message-id:mime-version\r
+       :content-type:x-gm-message-state;\r
+       bh=jboddLQPybnpqrd5wbau54sqAi5qCp+4xkZNJxhf01E=;\r
+       b=MMQ4wfDX463aGmP+1XTleIXlOn5w8txLJqz05dl0BwR6Z0QFWQBbwOLos1mXgu684D\r
+       sMiv3sOR5GbEx8dqHsEtRJrbN5xwmhSl0F9v8gozOlKSp0MhOJqdxWuaf91mzCM5pLLp\r
+       f9VqXOeCPYIJlzWTjSvzWHLvc2Fez0DUEVbEJ4XnCjXDn3giBkJ7f+TT0ociAbJZ2gYO\r
+       BccmxpBs9ZyDSUxXlx5rJ6naAAt4VzcYk7EdyPO1moQNYproTXVm3Ndgra3TsEts8DAu\r
+       Xy6T2BwMJaJaldjwkbRuINv70h/lBoR/ILNYElI5VeOh+jaswW7mTndYF8X/u5v+hbCf\r
+       UNhQ==\r
+Received: by 10.14.177.193 with SMTP id d41mr21009427eem.19.1346674567089;\r
+       Mon, 03 Sep 2012 05:16:07 -0700 (PDT)\r
+Received: by 10.14.177.193 with SMTP id d41mr21009404eem.19.1346674566933;\r
+       Mon, 03 Sep 2012 05:16:06 -0700 (PDT)\r
+Received: from mpn-glaptop ([2620:0:105f:5:f2de:f1ff:fe35:1a72])\r
+       by mx.google.com with ESMTPS id u47sm36013191eeo.9.2012.09.03.05.15.48\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Mon, 03 Sep 2012 05:16:04 -0700 (PDT)\r
+Sender: Michal Nazarewicz <mpn@google.com>\r
+From: Michal Nazarewicz <mina86@mina86.com>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2 3/5] test: fix hook-counter to accept the new\r
+       no-display param\r
+In-Reply-To:\r
+ <93a480b6dafc48d09b1cfa1a8858cc229025fac9.1346596156.git.jani@nikula.org>\r
+Organization: http://mina86.com/\r
+References: <cover.1346596156.git.jani@nikula.org>\r
+       <93a480b6dafc48d09b1cfa1a8858cc229025fac9.1346596156.git.jani@nikula.org>\r
+User-Agent: Notmuch/0.14+2~g416b120 (http://notmuchmail.org) Emacs/24.2.50.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: PbkBB1w#)bOqd`iCe"Ds{e+!C7`pkC9a|f)Qo^BMQvy\q5x3?vDQJeN(DS?|-^$uMti[3D*#^_Ts"pU$jBQLq~Ud6iNwAw_r_o_4]|JO?]}P_}Nc&"p#D(ZgUb4uCNPe7~a[DbPG0T~!&c.y$Ur,=N4RT>]dNpd;       KFrfMCylc}gc??'U2j,!8%xdD\r
+Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAJFBMVEWbfGlUPDDHgE57V0jUupKjgIObY0PLrom9mH4dFRK4gmjPs41MxjOgAAACQElEQVQ4jW3TMWvbQBQHcBk1xE6WyALX1069oZBMlq+ouUwpEQQ6uRjttkWP4CmBgGM0BQLBdPFZYPsyFUo6uEtKDQ7oy/U96XR2Ux8ehH/89Z6enqxBcS7Lg81jmSuujrfCZcLI/TYYvbGj+jbgFpHJ/bqQAUISj8iLyu4LuFHJTosxsucO4jSDNE0Hq3hwK/ceQ5sx97b8LcUDsILfk+ovHkOIsMbBfg43VuQ5Ln9YAGCkUdKJoXR9EclFBhixy3EGVz1K6eEkhxCAkeMMnqoAhAKwhoUJkDrCqvbecaYINlFKSRS1i12VKH1XpUd4qxL876EkMcDvHj3s5RBajHHMlA5iK32e0C7VgG0RlzFPvoYHZLRmAC0BmNcBruhkE0KsMsbEc62ZwUJDxWUdMsMhVqovoT96i/DnX/ASvz/6hbCabELLk/6FF/8PNpPCGqcZTGFcBhhAaZZDbQPaAB3+KrWWy2XgbYDNIinkdWAFcCpraDE/knwe5DBqGmgzESl1p2E4MWAz0VUPgYYzmfWb9yS4vCvgsxJriNTHoIBz5YteBvg+VGISQWUqhMiByPIPpygeDBE6elD973xWwKkEiHZAHKjhuPsFnBuArrzxtakRcISv+XMIPl4aGBUJm8Emk7qBYU8IlgNEIpiJhk/No24jHwkKTFHDWfPniR4iw5vJaw2nzSjfq2zffcE/GDjRC2dn0J0XwPAbDL84TvaFCJEU4Oml9pRyEUhR3Cl2t01AoEjRbs0sYugp14/4X5n4pU4EHHnMAAAAAElFTkSuQmCC\r
+X-PGP: 50751FF4\r
+X-PGP-FP: AC1F 5F5C D418 88F8 CC84 5858 2060 4012 5075 1FF4\r
+Date: Mon, 03 Sep 2012 14:15:43 +0200\r
+Message-ID: <xa1t4nnfwbdc.fsf@mina86.com>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/mixed; boundary="=-=-="\r
+X-Gm-Message-State: ALoCoQl46fmvMuG4Yzpg6nMpW+lzY1LV2Lb6+PSVSuyc20j6XUOllhYcYA0S44mkcvZFu9NwK34MemTqojvtimuZFBD1KhtwoIkc8hWOTQjhOJiOt7vCsFLNX0P+3gOFvRecfhaceCp/SY9RW51vCHoDDYzcCxGt9bYaTd/8YpqsDy/2sipm1dIX+Gmv2W8hUXLAIjvjLaYxzay1qHy7Ngvy3bp72zw8qQ==\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: Mon, 03 Sep 2012 12:16:11 -0000\r
+\r
+--=-=-=\r
+Content-Type: text/plain; charset=utf-8\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+Jani Nikula <jani@nikula.org> writes:\r
+> notmuch-hello-refresh-hook is now called with no-display param. Accept\r
+> (and ignore) it in hook-counter.\r
+\r
+This should go together with the previous patch since without this\r
+change, previous patch breaks code.\r
+\r
+> ---\r
+>  test/test-lib.el |    2 +-\r
+>  1 file changed, 1 insertion(+), 1 deletion(-)\r
+>\r
+> diff --git a/test/test-lib.el b/test/test-lib.el\r
+> index fa3380c..864780c 100644\r
+> --- a/test/test-lib.el\r
+> +++ b/test/test-lib.el\r
+> @@ -84,7 +84,7 @@ running, quit if it terminated."\r
+>        (kill-emacs)\r
+>      (run-at-time "1 min" nil 'orphan-watchdog pid)))\r
+>=20=20\r
+> -(defun hook-counter (hook)\r
+> +(defun hook-counter (hook &rest no-display)\r
+>    "Count how many times a hook is called.  Increments\r
+>  `hook'-counter variable value if it is bound, otherwise does\r
+>  nothing."\r
+> --=20\r
+> 1.7.9.5\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
+\r
+--=20\r
+Best regards,                                         _     _\r
+.o. | Liege of Serenely Enlightened Majesty of      o' \,=3D./ `o\r
+..o | Computer Science,  Micha=C5=82 =E2=80=9Cmina86=E2=80=9D Nazarewicz   =\r
+ (o o)\r
+ooo +----<email/xmpp: mpn@google.com>--------------ooO--(_)--Ooo--\r
+--=-=-=\r
+Content-Type: multipart/signed; boundary="==-=-=";\r
+       micalg=pgp-sha1; protocol="application/pgp-signature"\r
+\r
+--==-=-=\r
+Content-Type: text/plain\r
+\r
+\r
+--==-=-=\r
+Content-Type: application/pgp-signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v1.4.10 (GNU/Linux)\r
+\r
+iQIcBAEBAgAGBQJQRJ9vAAoJECBgQBJQdR/0JBwQAIJPJAjPum5JMivhelWDqRxd\r
+/C9JfAQ+gtDvceId51wPAyMaUamAwb8WvCdkWhNrjLZ9rH+vXDOKnuOZtnD5BQdj\r
+dk11TtHRoSiGfl+eHgZJ4nCwTC8XQ8ydqIBFx9og0fvtx/yleRdNodLPGmM5A7dT\r
+f8E+AJEnvdhwoD2jB9cMvnjPLLCsf2vO3vT0byY94ENIsJWURmKBnE7K7zzM3w1Q\r
+s3qGW0qUlmsk/syl5Ww/YrNMr+gqhzJYsjkdYx0Y/8IsgvYdza+1kk+qeY5MiaFL\r
+IT7EHdDJDXBwUPtm0asnd3URnm+/WEPxBrJz7gkSHdx9xvHoU3H70D1dV0T2nAHd\r
+AMN2iurTyu9Ea99Mo7XhYAnFYsBgex0ePS1xF59Rca6DICM4fqsbvB3colLao8Pk\r
+AwPXliYKoAjroT6YQyq9FtM0+WBgDkQJyo0l9dzn0QA8V2boSoPUV2RbZ0v2Pw9O\r
+3MwfqshchNwio65xXX8v7WkDA07HqFx8uoHGZB/FJswUQTsnnvBr2SfS3IxDguio\r
+OVqkJXa8Db2Bv52+/7dCVs9enWbtlkOF4Ctpehh0+bux1XGSp71SzAVK+i5f2I5E\r
+RXX3Zm4jMUHoZcRxPO5LeZlRYuApVMduQ2vhmyoMJgHhuFOigxwNny0rzgUhS0gj\r
+Fl3bDRmPLB3SV6LLlqXY\r
+=JidQ\r
+-----END PGP SIGNATURE-----\r
+--==-=-=--\r
+\r
+--=-=-=--\r