1 Return-Path: <dmitry.kurochkin@gmail.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id D1C18429E2F
\r
6 for <notmuch@notmuchmail.org>; Sun, 27 Nov 2011 19:28:42 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id SgnheniGMnOy for <notmuch@notmuchmail.org>;
\r
17 Sun, 27 Nov 2011 19:28:41 -0800 (PST)
\r
18 Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com
\r
19 [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id A4307431FB6
\r
22 for <notmuch@notmuchmail.org>; Sun, 27 Nov 2011 19:28:41 -0800 (PST)
\r
23 Received: by mail-bw0-f53.google.com with SMTP id q10so8621145bka.26
\r
24 for <notmuch@notmuchmail.org>; Sun, 27 Nov 2011 19:28:41 -0800 (PST)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
\r
26 h=from:to:subject:date:message-id:x-mailer:in-reply-to:references;
\r
27 bh=+fwpRlNoRc6ACSO7j/T1tPbMRv/TfhzjQ8gVcPAXgzM=;
\r
28 b=jYQx0I1KwrPoa64oVUqJE+AEj/XYxb/z/zqYl3qohE55Jy+b0HHMrvmXkhF25mpP8b
\r
29 ZKxs0fpZv6RfYMF53riCdQftMZXVi0FSicPj2RVhJhJMIq+MBrCudn18EIeOoCrJKGFS
\r
30 ayB39Acvk638nuKQOtGlF4CcRP4hyzTYjer8o=
\r
31 Received: by 10.204.29.8 with SMTP id o8mr42584166bkc.48.1322450921226;
\r
32 Sun, 27 Nov 2011 19:28:41 -0800 (PST)
\r
33 Received: from localhost ([91.144.186.21])
\r
34 by mx.google.com with ESMTPS id l5sm23264754bkv.9.2011.11.27.19.28.40
\r
35 (version=TLSv1/SSLv3 cipher=OTHER);
\r
36 Sun, 27 Nov 2011 19:28:40 -0800 (PST)
\r
37 From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
\r
38 To: notmuch@notmuchmail.org
\r
39 Subject: [PATCH 1/3] test: add functions to count how much times notmuch was
\r
41 Date: Mon, 28 Nov 2011 07:28:13 +0400
\r
42 Message-Id: <1322450895-32523-2-git-send-email-dmitry.kurochkin@gmail.com>
\r
43 X-Mailer: git-send-email 1.7.7.3
\r
44 In-Reply-To: <1322450895-32523-1-git-send-email-dmitry.kurochkin@gmail.com>
\r
45 References: <1322271878-32614-1-git-send-email-dmitry.kurochkin@gmail.com>
\r
46 <1322450895-32523-1-git-send-email-dmitry.kurochkin@gmail.com>
\r
47 X-BeenThere: notmuch@notmuchmail.org
\r
48 X-Mailman-Version: 2.1.13
\r
50 List-Id: "Use and development of the notmuch mail system."
\r
51 <notmuch.notmuchmail.org>
\r
52 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
53 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
54 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
55 List-Post: <mailto:notmuch@notmuchmail.org>
\r
56 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
57 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
58 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
59 X-List-Received-Date: Mon, 28 Nov 2011 03:28:43 -0000
\r
61 The patch adds two auxiliary functions and a variable:
\r
63 notmuch_counter_reset
\r
64 $notmuch_counter_command
\r
65 notmuch_counter_value
\r
67 They allow to count how many times notmuch binary is called.
\r
68 notmuch_counter_reset() function generates a script that counts how
\r
69 many times it is called and resets the counter to zero. The function
\r
70 sets $notmuch_counter_command variable to the path to the generated
\r
71 script that should be called instead of notmuch to do the counting.
\r
72 The notmuch_counter_value() function returns the current counter
\r
75 test/README | 16 ++++++++++++++--
\r
76 test/test-lib.sh | 32 ++++++++++++++++++++++++++++++++
\r
77 2 files changed, 46 insertions(+), 2 deletions(-)
\r
79 diff --git a/test/README b/test/README
\r
80 index 2481f16..5dc0638 100644
\r
83 @@ -187,8 +187,8 @@ library for your script to use.
\r
84 is to summarize successes and failures in the test script and
\r
85 exit with an appropriate error code.
\r
87 -There are also a number of mail-specific functions which are useful in
\r
89 +There are also a number of notmuch-specific auxiliary functions and
\r
90 +variables which are useful in writing tests:
\r
94 @@ -212,3 +212,15 @@ writing tests:
\r
95 will initialize the mail database to a known state of 50 sample
\r
96 messages, (culled from the early history of the notmuch mailing
\r
99 + notmuch_counter_reset
\r
100 + $notmuch_counter_command
\r
101 + notmuch_counter_value
\r
103 + These allow to count how many times notmuch binary is called.
\r
104 + notmuch_counter_reset() function generates a script that counts
\r
105 + how many times it is called and resets the counter to zero. The
\r
106 + function sets $notmuch_counter_command variable to the path to the
\r
107 + generated script that should be called instead of notmuch to do
\r
108 + the counting. The notmuch_counter_value() function prints the
\r
109 + current counter value.
\r
110 diff --git a/test/test-lib.sh b/test/test-lib.sh
\r
111 index 076f929..880bed9 100644
\r
112 --- a/test/test-lib.sh
\r
113 +++ b/test/test-lib.sh
\r
114 @@ -868,6 +868,38 @@ test_emacs () {
\r
115 emacsclient --socket-name="$EMACS_SERVER" --eval "(progn $@)"
\r
118 +# Creates a script that counts how much time it is executed and calls
\r
119 +# notmuch. $notmuch_counter_command is set to the path to the
\r
120 +# generated script. Use notmuch_counter_value() function to get the
\r
121 +# current counter value.
\r
122 +notmuch_counter_reset () {
\r
123 + notmuch_counter_command="$TMP_DIRECTORY/notmuch_counter"
\r
124 + if [ ! -x "$notmuch_counter_command" ]; then
\r
125 + notmuch_counter_state_path="$TMP_DIRECTORY/notmuch_counter.state"
\r
126 + cat >"$notmuch_counter_command" <<EOF || return
\r
129 +count=\$(cat "$notmuch_counter_state_path")
\r
130 +echo -n \$(expr \$count + 1) > "$notmuch_counter_state_path"
\r
132 +exec notmuch "\$@"
\r
134 + chmod +x "$notmuch_counter_command" || return
\r
137 + echo -n 0 > "$notmuch_counter_state_path"
\r
140 +# Returns the current notmuch counter value.
\r
141 +notmuch_counter_value () {
\r
142 + if [ -r "$notmuch_counter_state_path" ]; then
\r
143 + count=$(cat "$notmuch_counter_state_path")
\r
150 test_reset_state_ () {
\r
151 test_subtest_known_broken_=
\r