From: Jani Nikula Date: Fri, 15 Jun 2012 15:53:43 +0000 (+0300) Subject: [PATCH 2/3] test: fix hook-counter to accept the new no-display param X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=eda6fd8f1f0e99f46b1c184a88723d7b669eecec;p=notmuch-archives.git [PATCH 2/3] test: fix hook-counter to accept the new no-display param --- diff --git a/f5/fdee86bf2ff8616a622eae42726f2605193fb0 b/f5/fdee86bf2ff8616a622eae42726f2605193fb0 new file mode 100644 index 000000000..479c271a9 --- /dev/null +++ b/f5/fdee86bf2ff8616a622eae42726f2605193fb0 @@ -0,0 +1,94 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 7170E431FC7 + for ; Fri, 15 Jun 2012 08:53:55 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id I7S2gkessXQt for ; + Fri, 15 Jun 2012 08:53:53 -0700 (PDT) +Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com + [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 234FA431FB6 + for ; Fri, 15 Jun 2012 08:53:52 -0700 (PDT) +Received: by lbbgk8 with SMTP id gk8so3242305lbb.26 + for ; Fri, 15 Jun 2012 08:53:51 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references + :in-reply-to:references:x-gm-message-state; + bh=7yl2aAYK1OIl/82/cjuZRGGHtvIaTXXoILZSV+/UUUA=; + b=ZGS1MaldfeF5XnxqPURMEKwSQB4tDdC/bSSbrzcFqBBXLOKx9V+21B+j96sNnc0i0g + NxP6Rc+5wZ3QrXCEEW9/7FLoMBCUD99Bk3RPOr61jec0THllHs4ssyrFIXbrWiZLlOxg + H/UPQW4W0E0DGpSRwlmN6yLEA07asbijOo5owYIHr9tCOaoI68TnT6A1/VWtTVMoLyVe + WfqchL3JRpD3Xj6vS3ItBFH5TeB4M1tdI+2d9Ku+S76bAKe8Kjfu99pOHjTtxNE9vSzM + tg3KZfPDSftryznDG+4JfUtzNFVMYqX0eaxsXgcRR3y/eezc5lltJBpocdzack7V4bMn + 7U3g== +Received: by 10.112.29.166 with SMTP id l6mr2807608lbh.68.1339775631587; + Fri, 15 Jun 2012 08:53:51 -0700 (PDT) +Received: from localhost (dsl-hkibrasgw4-fe50dc00-68.dhcp.inet.fi. + [80.220.80.68]) + by mx.google.com with ESMTPS id hg4sm12969913lab.11.2012.06.15.08.53.49 + (version=SSLv3 cipher=OTHER); Fri, 15 Jun 2012 08:53:50 -0700 (PDT) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH 2/3] test: fix hook-counter to accept the new no-display param +Date: Fri, 15 Jun 2012 18:53:43 +0300 +Message-Id: + <04b277acfd9c74de89c745d2fa8a474d906b7102.1339775602.git.jani@nikula.org> +X-Mailer: git-send-email 1.7.9.5 +In-Reply-To: + <37899e28dbf67e4620a53279a869be3174c02d6f.1339775602.git.jani@nikula.org> +References: + <37899e28dbf67e4620a53279a869be3174c02d6f.1339775602.git.jani@nikula.org> +In-Reply-To: + <37899e28dbf67e4620a53279a869be3174c02d6f.1339775602.git.jani@nikula.org> +References: + <37899e28dbf67e4620a53279a869be3174c02d6f.1339775602.git.jani@nikula.org> +X-Gm-Message-State: + ALoCoQlsMbZFq9CCtH6UfPpGtbWUlmVPnBbe5FEw9DwNgWF3SluzU8KLBpbn8Aa2t70cLM8sY1F9 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Fri, 15 Jun 2012 15:53:56 -0000 + +notmuch-hello-refresh-hook is now called with no-display param. Accept +(and ignore) it in hook-counter. +--- + test/test-lib.el | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/test-lib.el b/test/test-lib.el +index 6271da2..9f66b0e 100644 +--- a/test/test-lib.el ++++ b/test/test-lib.el +@@ -74,7 +74,7 @@ running, quit if it terminated." + (kill-emacs) + (run-at-time "1 min" nil 'orphan-watchdog pid))) + +-(defun hook-counter (hook) ++(defun hook-counter (hook &rest no-display) + "Count how many times a hook is called. Increments + `hook'-counter variable value if it is bound, otherwise does + nothing." +-- +1.7.9.5 +