From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id CEWBGPa5jWCDCwEAgWs5BA (envelope-from ) for ; Sat, 01 May 2021 22:28:38 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id wJgQFPa5jWCnWQAAbx9fmQ (envelope-from ) for ; Sat, 01 May 2021 20:28:38 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F070318FC8 for ; Sat, 1 May 2021 22:28:37 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 8262C271E7; Sat, 1 May 2021 16:28:35 -0400 (EDT) Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [IPv6:2a0b:5c81:1c1::37]) by mail.notmuchmail.org (Postfix) with ESMTPS id 3FF13271E7 for ; Sat, 1 May 2021 16:28:33 -0400 (EDT) Received: from guru.guru-group.fi (unknown [IPv6:2a02:2380:1:9:5054:ff:feb7:a4bc]) (using TLSv1.2 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: too) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 3ABC41B0102A; Sat, 1 May 2021 23:28:32 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1619900912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=SCuJ4i8/as2o5ONpFGpJORBqmn6WBwCbIWEWvlVvkxs=; b=Nh416oPLCmfb/ZddW4DQZubDG96EZGqc8s0QOmdUYNjmnTat8O1EP62aytGW8dnbuLYtbv fIZGXbgjhLJwM+2DEEMubIrcU20JZmfgAsE1x5w1ENWFsLJrzyrpw4Ei/UNpT6nr+Ho0Eh r4+5AuqdXIE9l5HGuGV/C4iQHh7YvY+CfySI/rmTbgzSiMLirLOju5RRif9X5A5ibpkMNh K7+s9CXPqNaS9W3Wn5m0wbQny+yC41J6rmwJWslx/s/ZTj1OgDvuR3/TCTPejm9V78HePe q4ScwvCCnoHcQ5Fjc5Q22wrJCuRt9dU2pjicj4PavER3HIYlV8fiy+Vvrlw6lw== From: Tomi Ollila To: Felipe Contreras , notmuch@notmuchmail.org Subject: Re: [PATCH 12/13] test: trivial style cleanups In-Reply-To: <20210501115422.483314-13-felipe.contreras@gmail.com> References: <20210501115422.483314-1-felipe.contreras@gmail.com> <20210501115422.483314-13-felipe.contreras@gmail.com> User-Agent: Notmuch/0.31.4+128~gc67b63a (https://notmuchmail.org) Emacs/27.1 X-Face: HhBM'cA~ MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1619900912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=SCuJ4i8/as2o5ONpFGpJORBqmn6WBwCbIWEWvlVvkxs=; b=pNfz/3zKlxe005BqJ2PpmDF4NXdiVIBp+oMH9KHErdTj2MfhVeIc5rDd38/WXF+0ckM92n BCaMs+nthgrBDkZW2osHcDPVq/45Ij9Are4o7PDBqRN8bdQsNpB2qsjuH1RNw5kDovNR/6 RJxiPPc/spesw2pWQyO+mc1iKPAEIHY+wbHA8wWw8QBdkL05hraMR2c6xiVHeF0Kd4qwkZ 5PQm9nQvRUykZcvgvVZCf3MT6PDjLHEgbpOGM8Ib21zfJv6xV7n56PpY0J2INlR10Ln8xa KzSwWyeY/Y2IXuUBIfD2+ntmU4rQB2PHtDTyfDSaA9Fagb85e6uQ6IQeW6PFvw== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=too smtp.mailfrom=tomi.ollila@iki.fi ARC-Seal: i=1; s=lahtoruutu; d=iki.fi; t=1619900912; a=rsa-sha256; cv=none; b=vzwhFeO9Hkzhh8AruFSe0cBgKHwtb02a81pRacrMwslDuiQqKUmYszxMcd1DjTcHROG+Vq /D8jVKVr8yuNyyyqDv61EuadlENN3j0k1V42UfiMuQg9It6F8pT/HIPd0BpMZypSKcN1Nn nud+nDVylS0C8N6Yk42IjAjNu6MXnUPuhzwEIzTjERwwICeQocssIa3wVN7Ea/1NSm5NAF +RmfsRx1qc1I0X3rzo0qs36ZXlZwqeSmyFwV+Bd2fP03A2OeSV4Z/vclyzX6WETQY2we8H zl7ARvNM95IVghucabwo/r88HNHpz3FWTOI0FJZxWYL0HKGwFqVGHYufNe/vug== Message-ID-Hash: SAU7XDTIDU5JUH7DSQW3L7XACFGKXMMJ X-Message-ID-Hash: SAU7XDTIDU5JUH7DSQW3L7XACFGKXMMJ X-MailFrom: tomi.ollila@iki.fi X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Daniel Kahn Gillmor X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1619900918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=N1MG6ouwGgIFdC+7cTEvnFlR61xy/S5fDzYlIyX+72o=; b=MNhC7XTLsOAjNLLOLVMZnb9bOI1GAQ6mITUH+m/0ahqxFO7obaWrWnYMeETenQ2ZoGypDk PfHu+BetTPiEmIUhaQ1VxcRcAN9DczK2pR9j1jflc0GdM6j14obOYMPxrmtj88v+HQlST9 qJSrRw+7UamepsNHQF2wfUvdTWveMUaXTcHN6vqIwbD6eFpiWaXlyFUgYRrvnMB36V17I0 onS+wvNnHqTym1tT7rBLnIGmM0e8mYiixnKCI1d592FxKKPZPvZVBy9smZBBXHdMO4BSPZ msf+KjIPM3qSjiZvAcRj+ZPtdLBTRnOyspKWDvfVkryOu2gFeM9DvTLvcVd05w== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1619900918; a=rsa-sha256; cv=fail; b=SKO681djZFUJQyLApYElPXhxEDZUYfOnE+NnFv/fJpxfO/dKrHd2vrsfzWmUBCVWcBBW04 +Xk3BMEUOSmFdgIn4IhyDY4VvcW0wrMt+c/HGXPBXu7Wt/xrcJKAe9zuEmmA8IfHVo/MSm 5K19eFH9SDwwVbXx3Xe1jDWB5Zz/twknwFa74z+0Tc9bTYVHeTALlsackZzh1s9ZbddH/0 qPuV73SIiKbtt6pSnclr9UyS3jhnZAkdMcQsfCYNPKkqiuZd3URGQFM/BDxQ02cdcYtMZG vNmJqSAh1hcqwOlcXsOQXevZ1SK5HRzuQ6C3vNYvG3W0XzaZwErsWHrqvkYQwQ== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=iki.fi header.s=lahtoruutu header.b=Nh416oPL; arc=reject ("signature check failed: fail, {[1] = sig:iki.fi:reject}"); dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: 0.94 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=iki.fi header.s=lahtoruutu header.b=Nh416oPL; arc=reject ("signature check failed: fail, {[1] = sig:iki.fi:reject}"); dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: F070318FC8 X-Spam-Score: 0.94 X-Migadu-Scanner: scn0.migadu.com X-TUID: kYRe3ihRGO+f On Sat, May 01 2021, Felipe Contreras wrote: > Signed-off-by: Felipe Contreras LGTM Tomi > --- > test/T000-basic.sh | 2 +- > test/T070-insert.sh | 2 +- > test/T590-thread-breakage.sh | 10 +++++----- > test/export-dirs.sh | 2 +- > test/test-lib.sh | 8 ++++---- > 5 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/test/T000-basic.sh b/test/T000-basic.sh > index 7fbdcfa3..a2f4d93f 100755 > --- a/test/T000-basic.sh > +++ b/test/T000-basic.sh > @@ -33,7 +33,7 @@ test_begin_subtest 'failure to clean up causes the test to fail' > test_expect_code 2 'test_when_finished "(exit 2)"' > > EXPECTED=$NOTMUCH_SRCDIR/test/test.expected-output > -suppress_diff_date() { > +suppress_diff_date () { > sed -e 's/\(.*\-\-\- test-verbose\.4\.\expected\).*/\1/' \ > -e 's/\(.*\+\+\+ test-verbose\.4\.\output\).*/\1/' > } > diff --git a/test/T070-insert.sh b/test/T070-insert.sh > index b37a9b67..208deb1c 100755 > --- a/test/T070-insert.sh > +++ b/test/T070-insert.sh > @@ -15,7 +15,7 @@ notmuch new > /dev/null > # They happen to be in the mail directory already but that is okay > # since we do not call notmuch new hereafter. > > -gen_insert_msg() { > +gen_insert_msg () { > generate_message \ > "[subject]=\"insert-subject\"" \ > "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" \ > diff --git a/test/T590-thread-breakage.sh b/test/T590-thread-breakage.sh > index aeb82cf4..92a70e3e 100755 > --- a/test/T590-thread-breakage.sh > +++ b/test/T590-thread-breakage.sh > @@ -21,7 +21,7 @@ test_description='thread breakage during reindexing' > > . $(dirname "$0")/test-lib.sh || exit 1 > > -message_a() { > +message_a () { > mkdir -p ${MAIL_DIR}/cur > cat > ${MAIL_DIR}/cur/a < Subject: First message > @@ -35,7 +35,7 @@ Apple > EOF > } > > -message_b() { > +message_b () { > mkdir -p ${MAIL_DIR}/cur > cat > ${MAIL_DIR}/cur/b < Subject: Second message > @@ -52,19 +52,19 @@ EOF > } > > > -test_content_count() { > +test_content_count () { > test_begin_subtest "${3:-looking for $2 instance of '$1'}" > count=$(notmuch count --output=threads "$1") > test_expect_equal "$count" "$2" > } > > -test_thread_count() { > +test_thread_count () { > test_begin_subtest "${2:-Expecting $1 thread(s)}" > count=$(notmuch count --output=threads) > test_expect_equal "$count" "$1" > } > > -test_ghost_count() { > +test_ghost_count () { > test_begin_subtest "${2:-Expecting $1 ghosts(s)}" > ghosts=$($NOTMUCH_BUILDDIR/test/ghost-report ${MAIL_DIR}/.notmuch/xapian) > test_expect_equal "$ghosts" "$1" > diff --git a/test/export-dirs.sh b/test/export-dirs.sh > index 0578b1e5..844ee682 100644 > --- a/test/export-dirs.sh > +++ b/test/export-dirs.sh > @@ -9,7 +9,7 @@ if [[ -z "${NOTMUCH_SRCDIR}" ]]; then > export NOTMUCH_SRCDIR="$(cd "$(dirname "$0")"/.. && pwd)" > fi > > -find_builddir() > +find_builddir () > { > local dir="$1" > > diff --git a/test/test-lib.sh b/test/test-lib.sh > index 7fdc0007..1b502456 100644 > --- a/test/test-lib.sh > +++ b/test/test-lib.sh > @@ -585,7 +585,7 @@ notmuch_built_with_sanitize () > sed 's/^built_with[.]\(.*\)=.*$/built_with.\1=something/' > } > > -notmuch_passwd_sanitize() > +notmuch_passwd_sanitize () > { > ${NOTMUCH_PYTHON} -c' > import os, sys, pwd, socket > @@ -867,7 +867,7 @@ test_must_fail () { > # - cmp's output is not nearly as easy to read as diff -u > # - not all diff versions understand "-u" > > -test_cmp() { > +test_cmp () { > $GIT_TEST_CMP "$@" > } > > @@ -921,14 +921,14 @@ test_done () { > fi > } > > -test_python() { > +test_python () { > # Note: if there is need to print debug information from python program, > # use stdout = os.fdopen(6, 'w') or stderr = os.fdopen(7, 'w') > PYTHONPATH="$NOTMUCH_SRCDIR/bindings/python${PYTHONPATH:+:$PYTHONPATH}" \ > $NOTMUCH_PYTHON -B - > OUTPUT > } > > -test_ruby() { > +test_ruby () { > MAIL_DIR=$MAIL_DIR $NOTMUCH_RUBY -I "$NOTMUCH_BUILDDIR/bindings/ruby"> OUTPUT > } > > -- > 2.31.0 > _______________________________________________ > notmuch mailing list -- notmuch@notmuchmail.org > To unsubscribe send an email to notmuch-leave@notmuchmail.org