From: Tomi Ollila Date: Tue, 12 Nov 2013 20:41:08 +0000 (+0200) Subject: [PATCH 3/3] test: implement and document NOTMUCH_TEST_QUIET variable usage X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=069f2d296775a804557e2690d63bd4b9a1b77c2d;p=notmuch-archives.git [PATCH 3/3] test: implement and document NOTMUCH_TEST_QUIET variable usage --- diff --git a/cf/c181607d8671514ccd5cd7808938bbc2551f9c b/cf/c181607d8671514ccd5cd7808938bbc2551f9c new file mode 100644 index 000000000..9182e23e4 --- /dev/null +++ b/cf/c181607d8671514ccd5cd7808938bbc2551f9c @@ -0,0 +1,201 @@ +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 98887431FD7 + for ; Tue, 12 Nov 2013 12:41:26 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 iJa5g7vEtoDC for ; + Tue, 12 Nov 2013 12:41:22 -0800 (PST) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 05277431FDA + for ; Tue, 12 Nov 2013 12:41:18 -0800 (PST) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id BDB7710009D; Tue, 12 Nov 2013 22:41:13 +0200 (EET) +From: Tomi Ollila +To: notmuch@notmuchmail.org +Subject: [PATCH 3/3] test: implement and document NOTMUCH_TEST_QUIET variable + usage +Date: Tue, 12 Nov 2013 22:41:08 +0200 +Message-Id: <1384288868-23903-3-git-send-email-tomi.ollila@iki.fi> +X-Mailer: git-send-email 1.8.0 +In-Reply-To: <1384288868-23903-1-git-send-email-tomi.ollila@iki.fi> +References: <1384288868-23903-1-git-send-email-tomi.ollila@iki.fi> +Cc: tomi.ollila@iki.fi +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: Tue, 12 Nov 2013 20:41:27 -0000 + +When NOTMUCH_TEST_QUIET environment variable is set to non-null value +messages when new test script starts and when test PASSes are disabled. +This eases picking the cases when tests FAIL (as those are still printed). +--- + test/README | 8 ++++++++ + test/basic | 12 ++++++++++-- + test/test-lib.sh | 11 ++++++++++- + test/test.expected-output/test-quiet-verbose-no | 20 ++++++++++++++++++++ + test/test.expected-output/test-quiet-verbose-yes | 24 ++++++++++++++++++++++++ + 5 files changed, 72 insertions(+), 3 deletions(-) + create mode 100644 test/test.expected-output/test-quiet-verbose-no + create mode 100644 test/test.expected-output/test-quiet-verbose-yes + +diff --git a/test/README b/test/README +index d12cff2..79a9b1b 100644 +--- a/test/README ++++ b/test/README +@@ -76,6 +76,14 @@ the tests in one of the following ways. + TEST_EMACS=my-special-emacs TEST_EMACSCLIENT=my-emacsclient ./emacs + make test TEST_EMACS=my-special-emacs TEST_EMACSCLIENT=my-emacsclient + ++Quiet Execution ++--------------- ++ ++Normally, when new script starts and when test PASSes you get a message ++printed on screen. This printing can be disabled by setting the ++NOTMUCH_TEST_QUIET variable to a non-null value. Message on test ++failures and skips are still printed. ++ + Skipping Tests + -------------- + If, for any reason, you need to skip one or more tests, you can do so +diff --git a/test/basic b/test/basic +index 64eb7d7..3b7668b 100755 +--- a/test/basic ++++ b/test/basic +@@ -73,14 +73,22 @@ suppress_diff_date() { + -e 's/\(.*\+\+\+ test-verbose\.4\.\output\).*/\1/' + } + ++if [ -z "$NOTMUCH_TEST_QUIET" ] ++then ++ test_verbose_no=$EXPECTED/test-verbose-no ++ test_verbose_yes=$EXPECTED/test-verbose-yes ++else ++ test_verbose_no=$EXPECTED/test-quiet-verbose-no ++ test_verbose_yes=$EXPECTED/test-quiet-verbose-yes ++fi + test_begin_subtest "Ensure that test output is suppressed unless the test fails" + output=$(cd $TEST_DIRECTORY; ./test-verbose 2>&1 | suppress_diff_date) +-expected=$(cat $EXPECTED/test-verbose-no | suppress_diff_date) ++expected=$(cat ${test_verbose_no} | suppress_diff_date) + test_expect_equal "$output" "$expected" + + test_begin_subtest "Ensure that -v does not suppress test output" + output=$(cd $TEST_DIRECTORY; ./test-verbose -v 2>&1 | suppress_diff_date) +-expected=$(cat $EXPECTED/test-verbose-yes | suppress_diff_date) ++expected=$(cat ${test_verbose_yes} | suppress_diff_date) + # Do not include the results of test-verbose in totals + rm $TEST_DIRECTORY/test-results/test-verbose + rm -r $TEST_DIRECTORY/tmp.test-verbose +diff --git a/test/test-lib.sh b/test/test-lib.sh +index e022e46..4b342ac 100644 +--- a/test/test-lib.sh ++++ b/test/test-lib.sh +@@ -195,7 +195,10 @@ print_test_description () + echo + echo $this_test: "Testing ${test_description}" + } +-print_test_description ++if [ -z "$NOTMUCH_TEST_QUIET" ] ++then ++ print_test_description ++fi + + exec 5>&1 + +@@ -703,6 +706,9 @@ test_ok_ () { + return + fi + test_success=$(($test_success + 1)) ++ if test -n "$NOTMUCH_TEST_QUIET"; then ++ return 0 ++ fi + say_color pass "%-6s" "PASS" + echo " $test_subtest_name" + } +@@ -713,6 +719,9 @@ test_failure_ () { + return + fi + test_failure=$(($test_failure + 1)) ++ if test -n "$NOTMUCH_TEST_QUIET"; then ++ print_test_description ++ fi + test_failure_message_ "FAIL" "$test_subtest_name" "$@" + test "$immediate" = "" || { GIT_EXIT_OK=t; exit 1; } + return 1 +diff --git a/test/test.expected-output/test-quiet-verbose-no b/test/test.expected-output/test-quiet-verbose-no +new file mode 100644 +index 0000000..74840b9 +--- /dev/null ++++ b/test/test.expected-output/test-quiet-verbose-no +@@ -0,0 +1,20 @@ ++ ++test-verbose: Testing the verbosity options of the test framework itself. ++ FAIL print something in test_expect_success and fail ++ ++ echo "hello stdout" && ++ echo "hello stderr" >&2 && ++ false ++ ++hello stdout ++hello stderr ++ ++test-verbose: Testing the verbosity options of the test framework itself. ++ FAIL print something test_begin_subtest and test_expect_equal and fail ++ --- test-verbose.4.expected ++ +++ test-verbose.4.output ++ @@ -1 +1 @@ ++ -b ++ +a ++hello stdout ++hello stderr +diff --git a/test/test.expected-output/test-quiet-verbose-yes b/test/test.expected-output/test-quiet-verbose-yes +new file mode 100644 +index 0000000..51e759d +--- /dev/null ++++ b/test/test.expected-output/test-quiet-verbose-yes +@@ -0,0 +1,24 @@ ++hello stdout ++hello stderr ++hello stdout ++hello stderr ++ ++test-verbose: Testing the verbosity options of the test framework itself. ++ FAIL print something in test_expect_success and fail ++ ++ echo "hello stdout" && ++ echo "hello stderr" >&2 && ++ false ++ ++hello stdout ++hello stderr ++hello stdout ++hello stderr ++ ++test-verbose: Testing the verbosity options of the test framework itself. ++ FAIL print something test_begin_subtest and test_expect_equal and fail ++ --- test-verbose.4.expected ++ +++ test-verbose.4.output ++ @@ -1 +1 @@ ++ -b ++ +a +-- +1.8.3.1 +