[PATCH v2 3/5] test: fix hook-counter to accept the new no-display param

diff --git a/3f/f5a0057f70b60466d1777d62f65938a48bd0a6 b/3f/f5a0057f70b60466d1777d62f65938a48bd0a6
new file mode 100644 (file)
index 0000000..b73ce13
--- /dev/null
+++ b/3f/f5a0057f70b60466d1777d62f65938a48bd0a6
@@ -0,0 +1,91 @@
+Return-Path: <jani@nikula.org>\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 938EC429E29\r
+       for <notmuch@notmuchmail.org>; Sun,  2 Sep 2012 07:49:01 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\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=[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 bpGxf1VTbx+j for <notmuch@notmuchmail.org>;\r
+       Sun,  2 Sep 2012 07:49:00 -0700 (PDT)\r
+Received: from mail-lpp01m010-f53.google.com (mail-lpp01m010-f53.google.com\r
+       [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 11FA3431FD9\r
+       for <notmuch@notmuchmail.org>; Sun,  2 Sep 2012 07:48:50 -0700 (PDT)\r
+Received: by mail-lpp01m010-f53.google.com with SMTP id c1so3338105lah.26\r
+       for <notmuch@notmuchmail.org>; Sun, 02 Sep 2012 07:48:50 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references\r
+       :in-reply-to:references:x-gm-message-state;\r
+       bh=n23bydRZ6ELMht3L2mExiq+EgpwZoMBoybNJcLdt1uk=;\r
+       b=Kt3JQ6siKCeberyY6R2qnBvW/7qz2f36N03JSiZHsku3CKkg6RiKzhGG0euJV1Hrf2\r
+       DMaWrv9u1ZsnyppLlNjZH1/QwDAWTZa5WGEUZqe4Rh5G5FouYjiPCYf7+Bi4K5yEi9Ph\r
+       YTgndx/VSF9hB/5OrzXYN68DCKx11n5lBpPWn9K2WwtLwvG7gJu7aBJ9EwNiXLI9/53p\r
+       kcBUWiwqQda2SyWCGgxSbogiywT/ImnvID1WkxfjxJK0yTa95/ZjlbXpz5Y5ly5BJYqw\r
+       bZi6BPiLF8uNPjsd7Nnz/Nuue6R9MZaQrqbmZgJ2LIeNdNdErfcdTM7CK+lwIrl1ftB4\r
+       TM6g==\r
+Received: by 10.152.110.46 with SMTP id hx14mr11395972lab.21.1346597330655;\r
+       Sun, 02 Sep 2012 07:48:50 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi.\r
+       [80.223.81.27])\r
+       by mx.google.com with ESMTPS id sy1sm10706287lab.13.2012.09.02.07.48.48\r
+       (version=SSLv3 cipher=OTHER); Sun, 02 Sep 2012 07:48:49 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 3/5] test: fix hook-counter to accept the new no-display\r
+       param\r
+Date: Sun,  2 Sep 2012 17:48:35 +0300\r
+Message-Id:\r
+ <93a480b6dafc48d09b1cfa1a8858cc229025fac9.1346596156.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.9.5\r
+In-Reply-To: <cover.1346596156.git.jani@nikula.org>\r
+References: <cover.1346596156.git.jani@nikula.org>\r
+In-Reply-To: <cover.1346596156.git.jani@nikula.org>\r
+References: <cover.1346596156.git.jani@nikula.org>\r
+X-Gm-Message-State:\r
+ ALoCoQktEvPoFQCtEUeNzwydL1McDe91bWxEpoe8i72HdzqLAkiLrOwMvPr23BSE3TGmgOqAU7/n\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: Sun, 02 Sep 2012 14:49:02 -0000\r
+\r
+notmuch-hello-refresh-hook is now called with no-display param. Accept\r
+(and ignore) it in hook-counter.\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
+ \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
+-- \r
+1.7.9.5\r
+\r