[tor-commits] [chutney/master] tests: Make the scripts less verbose

[teor at torproject.org]

commit 666ac7c6d8357da5829a6abaddb57400500d048f
Author: teor <teor at torproject.org>
Date:   Mon Feb 17 16:43:18 2020 +1000

    tests: Make the scripts less verbose
    
    We don't need to output the entire contents of these scripts.
    
    Part of 32792.
---
 tests/shellcheck-tests.sh | 5 +++--
 tests/unit-tests.sh       | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/shellcheck-tests.sh b/tests/shellcheck-tests.sh
index 84eade8..3a16387 100755
--- a/tests/shellcheck-tests.sh
+++ b/tests/shellcheck-tests.sh
@@ -2,8 +2,6 @@
 
 # Exit on errors
 set -e
-# Verbose mode
-set -v
 
 # SC1117 was disabled after 0.5, because it was too pedantic
 EXCLUSIONS="--exclude=SC1117"
@@ -21,6 +19,9 @@ cd "$CHUTNEY_DIR"
 
 echo "$myname: running shellcheck tests with $EXCLUSIONS"
 
+# Verbose mode
+set -v
+
 shellcheck "$EXCLUSIONS" chutney
 
 find . -name "*.sh" -exec shellcheck "$EXCLUSIONS" {} +
diff --git a/tests/unit-tests.sh b/tests/unit-tests.sh
index 2bf99c1..8520e8a 100755
--- a/tests/unit-tests.sh
+++ b/tests/unit-tests.sh
@@ -2,8 +2,6 @@
 
 # Exit on errors
 set -e
-# Verbose mode
-set -v
 
 # Output is prefixed with the name of the script
 myname=$(basename "$0")
@@ -51,6 +49,7 @@ LOG_FILE=$(mktemp)
 export LOG_FILE
 test -n "$LOG_FILE"
 
+echo "$myname: checking for Templating.py failures:"
 $PYTHON lib/chutney/Templating.py torrc_templates/common.i | tee "$LOG_FILE"
 grep -q owning_controller_process "$LOG_FILE"
 grep -q connlimit "$LOG_FILE"