commit 07153fc46f99d4f9148bb25446bba4e1b474f1f4 Author: teor teor@torproject.org Date: Thu Mar 12 20:15:03 2020 +1000

test-network: Clarify bootstrap attempts

The current script output makes it easy to confuse bootstrap attempts and verify rounds.

Change the output to make it clearer.

Part of 33583. --- tools/test-network-impl.sh | 6 +++--- tools/test-network.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/test-network-impl.sh b/tools/test-network-impl.sh index 4fa4482..c06071e 100755 --- a/tools/test-network-impl.sh +++ b/tools/test-network-impl.sh @@ -51,7 +51,7 @@ if [ "$CHUTNEY_BOOTSTRAP_TIME" -ge 0 ]; then # Chutney will try to verify for $CHUTNEY_BOOTSTRAP_TIME seconds each round n_rounds=0 # Run CHUTNEY_ROUNDS verification rounds - $ECHO "Running $CHUTNEY_ROUNDS verify rounds..." + $ECHO "Running $CHUTNEY_ROUNDS verify rounds for this bootstrap..." while [ "$n_rounds" -lt "$CHUTNEY_ROUNDS" ]; do n_rounds=$((n_rounds+1)) if ! "$CHUTNEY" verify "$CHUTNEY_NETWORK"; then @@ -60,10 +60,10 @@ if [ "$CHUTNEY_BOOTSTRAP_TIME" -ge 0 ]; then CHUTNEY_WARNINGS_SUMMARY=false \ "$WARNING_COMMAND" "$WARNINGS" - $ECHO "chutney verify $n_rounds/$CHUTNEY_ROUNDS failed" + $ECHO "chutney verify round $n_rounds/$CHUTNEY_ROUNDS failed" exit 1 fi - $ECHO "Completed $n_rounds/$CHUTNEY_ROUNDS verify rounds." + $ECHO "Completed verify round $n_rounds/$CHUTNEY_ROUNDS in this bootstrap" done else $ECHO "Chutney network ready and running. To stop the network, use:" diff --git a/tools/test-network.sh b/tools/test-network.sh index d2507b4..9d06027 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -382,7 +382,7 @@ max_attempts=$((CHUTNEY_ALLOW_FAILURES+1))

while [ "$n_attempts" -lt "$max_attempts" ]; do n_attempts=$((n_attempts+1)) - $ECHO "==== Running tests: attempt $n_attempts/$max_attempts" + $ECHO "==== Running tests: bootstrap attempt $n_attempts/$max_attempts" if "$CHUTNEY_PATH/tools/test-network-impl.sh"; then $ECHO "==== Chutney succeeded after $n_attempts attempt(s)." exit 0 @@ -392,5 +392,5 @@ while [ "$n_attempts" -lt "$max_attempts" ]; do fi done

-$ECHO "Chutney failed $n_attempts times; we may have a problem here." +$ECHO "Chutney failed $n_attempts bootstraps; we may have a problem here." exit 1