From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 4BdIBpYzoGBV2wAAgWs5BA (envelope-from ) for ; Sat, 15 May 2021 22:48:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id AG3NAZYzoGD1cgAAbx9fmQ (envelope-from ) for ; Sat, 15 May 2021 20:48:22 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (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 21042AFB9 for ; Sat, 15 May 2021 22:48:21 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id A873427E08; Sat, 15 May 2021 16:48:09 -0400 (EDT) Received: from mail-ot1-x330.google.com (mail-ot1-x330.google.com [IPv6:2607:f8b0:4864:20::330]) by mail.notmuchmail.org (Postfix) with ESMTPS id DC78327E08 for ; Sat, 15 May 2021 16:48:06 -0400 (EDT) Received: by mail-ot1-x330.google.com with SMTP id n32-20020a9d1ea30000b02902a53d6ad4bdso2327773otn.3 for ; Sat, 15 May 2021 13:48:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rFHRr7KWz2ZEBXlb7v+lOb69iDv/lJa29etYklFSZHk=; b=IZpUMbA+3ld8OMlB/jf77km8EVe9tUYjojEHsbuiR7KeGzZQaaE+RhyxlWWmsD7mfI VYqKUyw46eV3K6iOXVFqNrQvJTpYzA/5zCw3y+390gmyaaKFh0IKlLeG+nddwczsG43O qqSVsqd1pYTQU5HIOIyNIM01c6ixO/X9HuJ2RRTKxsh+ycZeur6gnR39/sO6sxwvGf7i LAVXdT9qBFkl0rwwrg0LZoVv23woVnM3Bh7ob9E/RsoxrmrYrOIixlyK2WtcV4v1FRvO 1J8cFuchrCyfT+x8SkiF2uL8EC8A4hPA0BYxaJdhULCQnv+Brdz5hcpWekoMQGCP8esw xzbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rFHRr7KWz2ZEBXlb7v+lOb69iDv/lJa29etYklFSZHk=; b=TsKp4CLN2PHpLWJyts425fBRzsANt0EisaP8UmFO/ToUdtxRpiVB5YLK5qn5XWzgx9 +Xu9IEu8fi4i6o5EclLSExFF0g7Nx9Tt0FpREwPcdeVU/G1U74QPqKq+egKlZP8P40Hz 4S3+yHsP3sISEC/PTsfpbYg4cU05kaBV68evGth2cWP1o7ftUXhrDN61PaBu1GnGAQO7 ac8+agIuQRpEZT4FZX5EO6y3qNOa9/wVIIU9sV6tlFZR3dqawSEB4Pt9Ny3niGJMxyLZ 4e0UK6LnPrWUbwb+R92TruZVHCLU7GIMXvd14bGt1IdQKphDXCI5NCsit7t5lCWTaGWM oHOw== X-Gm-Message-State: AOAM531DKltZ7ML/waDqdV50PZKiStDGlPAJDXrTmqq0gR0cb8R8uHRV AHCFRlPmkYye0w+SmA5xQb2hUVazKkE1zQ== X-Google-Smtp-Source: ABdhPJwCn9+byVwuDUmpNZGQClwcVqBLm52TAlCDXDOSmtAx4ybg0Lpo+3npApGD50w5Df/SKUz0UQ== X-Received: by 2002:a9d:2ac8:: with SMTP id e66mr1856686otb.360.1621111685445; Sat, 15 May 2021 13:48:05 -0700 (PDT) Received: from localhost (fixed-187-189-165-231.totalplay.net. [187.189.165.231]) by smtp.gmail.com with ESMTPSA id h81sm1923860oif.53.2021.05.15.13.48.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 May 2021 13:48:05 -0700 (PDT) From: Felipe Contreras To: notmuch@notmuchmail.org Subject: [PATCH v2 2/6] test: more style fixes Date: Sat, 15 May 2021 15:47:40 -0500 Message-Id: <20210515204744.965206-3-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210515204744.965206-1-felipe.contreras@gmail.com> References: <20210515204744.965206-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Message-ID-Hash: C44BGDW4H35UKIBD3KMMUNUPSJIPKA5A X-Message-ID-Hash: C44BGDW4H35UKIBD3KMMUNUPSJIPKA5A X-MailFrom: felipe.contreras@gmail.com 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=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1621111701; 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=FUj9885Ubab0QIzkwO0VJb1h43gvzqhEqQFn4btFTtE=; b=pHgfNRB0NDxFP7IX3Jit5+wFHYCZI86mCJtJ1XeS4dXQ9aTrO9xiFjhoWIigqinkE4sG1d vmejdJKv3U4hcAaWkMW69Gbsk70A1br9mCjqb+QTQavri942XpwWwlGL2AUI3fFoSTzZRB MqWDloI71QVro+Mfzo8t46cLb1TYK7512GBClwHAMEBpsZ/zB4eP+ClSV/Gclho8pMJ7Ac UFf0w2PoRHqr0Cji6QJ5sqi2a5EtZU5IHkINPFKiqLI88QOMVu6P+TJydqa2yaWqAj4BzK iVhRAtkq0cYqrjwM0LO0e1KCiZsh1zTZzDFbTOx1ALmlVcvsIJyncCKv/W3Mjg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1621111701; a=rsa-sha256; cv=none; b=X/cwiBzIH6CSL3RIbcPbQ5De/CD7TwyOLoamjTfUnb97AdNuiJwxVbnOAYjjZASLs8yj4A XOHLp9BVISPFgTiUFZ6QXivBVG/sbUl72qK0iWSQ2AmtX8/wMYGainDXSxLg5g0zXRLULF M+oLMcecCIBpUGYrWWGFZ3cYRFU4zixLFiuZLJUZxo8GC7XZ99qEA6JIGt3KXBBhUp1pG6 mWCF8RqJM8E1DnzShEK1bPXojjBJf5ImbPEjv4q5pWGPIRcINeBgqXekeTI05G4nFIBfPv dCtgu3YjOmrN1toX18aIlNHRYIFNJr2gwPvFjafxqxMtpWPvEcW5Gbp1Adtd3g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20161025 header.b=IZpUMbA+; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -0.97 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20161025 header.b=IZpUMbA+; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 21042AFB9 X-Spam-Score: -0.97 X-Migadu-Scanner: scn0.migadu.com X-TUID: pf4DbtjJd2dF In order to fit the git coding style. Signed-off-by: Felipe Contreras --- test/T140-excludes.sh | 3 +- test/T190-multipart.sh | 3 +- test/T490-parse-time-string.sh | 6 +-- test/export-dirs.sh | 3 +- test/test-lib-common.sh | 6 +-- test/test-lib.sh | 78 ++++++++++++---------------------- 6 files changed, 33 insertions(+), 66 deletions(-) diff --git a/test/T140-excludes.sh b/test/T140-excludes.sh index acab5381..352b3eb8 100755 --- a/test/T140-excludes.sh +++ b/test/T140-excludes.sh @@ -5,8 +5,7 @@ test_description='"notmuch search, count and show" with excludes in several vari # Generates a thread consisting of a top level message and 'length' # replies. The subject of the top message 'subject: top message" # and the subject of the nth reply in the thread is "subject: reply n" -generate_thread () -{ +generate_thread () { local subject="$1" local length="$2" generate_message '[subject]="'"${subject}: top message"'"' '[body]="'"body of top message"'"' diff --git a/test/T190-multipart.sh b/test/T190-multipart.sh index 6f715ff9..3545a599 100755 --- a/test/T190-multipart.sh +++ b/test/T190-multipart.sh @@ -725,8 +725,7 @@ EOF notmuch new > /dev/null -cat_expected_head () -{ +cat_expected_head () { cat < /dev/null } diff --git a/test/test-lib.sh b/test/test-lib.sh index 3147b782..c1395c87 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -120,8 +120,7 @@ test_require_emacs () { test_require_external_prereq dtach } -add_gnupg_home () -{ +add_gnupg_home () { [ -e "${GNUPGHOME}/gpg.conf" ] && return _gnupg_exit () { gpgconf --kill all 2>/dev/null || true; } at_exit_function _gnupg_exit @@ -141,8 +140,7 @@ add_gnupg_home () printf '%s:6:\n' "$FINGERPRINT" | gpg --quiet --batch --no-tty --import-ownertrust } -add_gpgsm_home () -{ +add_gpgsm_home () { local fpr [ -e "$GNUPGHOME/gpgsm.conf" ] && return _gnupg_exit () { gpgconf --kill all 2>/dev/null || true; } @@ -274,8 +272,7 @@ then fi test_description_printed= -print_test_description () -{ +print_test_description () { test -z "$test_description_printed" || return 0 echo echo $this_test: "Testing ${test_description}" @@ -355,8 +352,7 @@ trap 'trap_signal' HUP INT TERM # Accepts arbitrary extra emacs/elisp functions to modify the message # before sending, which is useful to doing things like attaching files # to the message and encrypting/signing. -emacs_deliver_message () -{ +emacs_deliver_message () { local subject body smtp_dummy_pid smtp_dummy_port subject="$1" body="$2" @@ -402,8 +398,7 @@ emacs_deliver_message () # If any GNU-style long-arguments (like --quiet or --decrypt=true) are # at the head of the argument list, they are sent directly to "notmuch # new" after message delivery -emacs_fcc_message () -{ +emacs_fcc_message () { local nmn_args subject body nmn_args='' while [[ "$1" =~ ^-- ]]; do @@ -441,8 +436,7 @@ emacs_fcc_message () # history of the notmuch mailing list, which allows for reliably # testing commands that need to operate on a not-totally-trivial # number of messages. -add_email_corpus () -{ +add_email_corpus () { local corpus corpus=${1:-default} @@ -451,8 +445,7 @@ add_email_corpus () notmuch new >/dev/null || die "'notmuch new' failed while adding email corpus" } -test_begin_subtest () -{ +test_begin_subtest () { if [ -n "$inside_subtest" ]; then exec 1>&6 2>&7 # Restore stdout and stderr error "bug in test script: Missing test_expect_equal in ${BASH_SOURCE[1]}:${BASH_LINENO[0]}" @@ -472,8 +465,7 @@ test_begin_subtest () # not accept a test name. Instead, the caller should call # test_begin_subtest before calling this function in order to set the # name. -test_expect_equal () -{ +test_expect_equal () { local output expected testname exec 1>&6 2>&7 # Restore stdout and stderr if [ -z "$inside_subtest" ]; then @@ -499,8 +491,7 @@ test_expect_equal () } # Like test_expect_equal, but takes two filenames. -test_expect_equal_file () -{ +test_expect_equal_file () { local file1 file2 testname basename1 basename2 exec 1>&6 2>&7 # Restore stdout and stderr if [ -z "$inside_subtest" ]; then @@ -616,19 +607,16 @@ test_emacs_expect_t () { fi } -NOTMUCH_NEW () -{ +NOTMUCH_NEW () { notmuch new "${@}" | grep -v -E -e '^Processed [0-9]*( total)? file|Found [0-9]* total file' } -NOTMUCH_DUMP_TAGS () -{ +NOTMUCH_DUMP_TAGS () { # this relies on the default format being batch-tag, otherwise some tests will break notmuch dump --include=tags "${@}" | sed '/^#/d' | sort } -notmuch_drop_mail_headers () -{ +notmuch_drop_mail_headers () { $NOTMUCH_PYTHON -c ' import email, sys msg = email.message_from_file(sys.stdin) @@ -637,41 +625,34 @@ print(msg.as_string(False)) ' "$@" } -notmuch_exception_sanitize () -{ +notmuch_exception_sanitize () { perl -pe 's/(A Xapian exception occurred at .*[.]cc?):([0-9]*)/\1:XXX/' } -notmuch_search_sanitize () -{ +notmuch_search_sanitize () { perl -pe 's/("?thread"?: ?)("?)................("?)/\1\2XXX\3/' } -notmuch_search_files_sanitize () -{ +notmuch_search_files_sanitize () { notmuch_dir_sanitize } -notmuch_dir_sanitize () -{ +notmuch_dir_sanitize () { sed -e "s,$MAIL_DIR,MAIL_DIR," -e "s,${PWD},CWD,g" "$@" } NOTMUCH_SHOW_FILENAME_SQUELCH='s,filename:.*/mail,filename:/XXX/mail,' -notmuch_show_sanitize () -{ +notmuch_show_sanitize () { sed -e "$NOTMUCH_SHOW_FILENAME_SQUELCH" } -notmuch_show_sanitize_all () -{ +notmuch_show_sanitize_all () { sed \ -e 's| filename:.*| filename:XXXXX|' \ -e 's| id:[^ ]* | id:XXXXX |' | \ notmuch_date_sanitize } -notmuch_json_show_sanitize () -{ +notmuch_json_show_sanitize () { sed \ -e 's|"id": "[^"]*",|"id": "XXXXX",|g' \ -e 's|"Date": "Fri, 05 Jan 2001 [^"]*0000"|"Date": "GENERATED_DATE"|g' \ @@ -681,8 +662,7 @@ notmuch_json_show_sanitize () -e 's|"content-length": [1-9][0-9]*|"content-length": "NONZERO"|g' } -notmuch_emacs_error_sanitize () -{ +notmuch_emacs_error_sanitize () { local command command=$1 shift @@ -694,24 +674,20 @@ notmuch_emacs_error_sanitize () -e "s|^\(command: \)\{0,1\}/.*/$command|\1YYY/$command|" } -notmuch_date_sanitize () -{ +notmuch_date_sanitize () { sed \ -e 's/^Date: Fri, 05 Jan 2001 .*0000/Date: GENERATED_DATE/' } -notmuch_uuid_sanitize () -{ +notmuch_uuid_sanitize () { sed 's/[0-9a-f]\{8\}-[0-9a-f]\{4\}-[0-9a-f]\{4\}-[0-9a-f]\{4\}-[0-9a-f]\{12\}/UUID/g' } -notmuch_built_with_sanitize () -{ +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 @@ -731,13 +707,11 @@ for l in sys.stdin: ' } -notmuch_config_sanitize () -{ +notmuch_config_sanitize () { notmuch_dir_sanitize | notmuch_built_with_sanitize } -notmuch_show_part () -{ +notmuch_show_part () { awk '/^\014part}/{ f=0 }; { if (f) { print $0 } } /^\014part{ ID: '"$1"'/{ f=1 }' } -- 2.31.1