February 2020 - tor-commits - lists.torproject.org

[chutney/master] test-network: Fix a typo in NETWORK_FLAVOUR
by teor＠torproject.org 19 Feb '20

19 Feb '20

commit d58548ecb5cf696063be712839d41c51658005b7 Author: teor <teor(a)torproject.org> Date: Wed Feb 19 17:36:21 2020 +1000 test-network: Fix a typo in NETWORK_FLAVOUR Unfortunately, we use the UK English spelling for this variable. Obviously correct changes to already-reviewed code. --- tools/test-network-impl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test-network-impl.sh b/tools/test-network-impl.sh index 8a8413d..a272f30 100755 --- a/tools/test-network-impl.sh +++ b/tools/test-network-impl.sh @@ -2,7 +2,7 @@ if ! "$CHUTNEY_PATH/tools/bootstrap-network.sh" "$NETWORK_FLAVOUR"; then if test "$?" = 77; then - $ECHO "SKIP: $NETWORK_FLAVOR not supported." + $ECHO "SKIP: $NETWORK_FLAVOUR not supported." exit 77 fi "$DIAGNOSTICS"

1 0

[chutney/master] Travis: Add a missing NETWORK_FLAVOUR
by teor＠torproject.org 19 Feb '20

19 Feb '20

commit cace8eb6f88c61412daa3e526956e4cc11c506fe Author: teor <teor(a)torproject.org> Date: Wed Feb 19 17:35:18 2020 +1000 Travis: Add a missing NETWORK_FLAVOUR This network was running chutney's default network flavour before, changing to basic-min shouldn't make any difference. Obviously correct changes to already-reviewed code. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 73f0bfe..b651e13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -131,7 +131,7 @@ matrix: language: c python: ## python 3 is already installed, under this name - env: PYTHON="python3" TOR="stable-release" + env: PYTHON="python3" TOR="stable-release" NETWORK_FLAVOUR="basic-min" ## Pre-installed in Travis Bionic: ## https://docs.travis-ci.com/user/reference/bionic/#python-support

1 0

[chutney/master] tools: Add a detailed diagnostics script
by teor＠torproject.org 19 Feb '20

19 Feb '20

commit bbd7307179d7290250fd6bda1fff956b7263db22 Author: teor <teor(a)torproject.org> Date: Mon Feb 17 16:15:23 2020 +1000 tools: Add a detailed diagnostics script Part of 32792. --- tools/diagnostics.sh | 194 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) diff --git a/tools/diagnostics.sh b/tools/diagnostics.sh new file mode 100755 index 0000000..e099514 --- /dev/null +++ b/tools/diagnostics.sh @@ -0,0 +1,194 @@ +#!/bin/sh +# +# Usage: +# tools/diagnostics.sh [node] +# +# Output: +# show file contents and filesystem permissions for the most recent chutney +# network. +# +# If the argument node is specified, show the file contents for that node, +# otherwise, show the contents for the first node (000*). +# +# Always show some network-wide diagnostics and authority diagnostics, +# regardless of the chosen node. +# +# Examples: +# tools/diagnostics.sh +# tools/diagnostics.sh 001a + +if [ ! -d "$CHUTNEY_PATH" ] || [ ! -x "$CHUTNEY_PATH/chutney" ]; then + # looks like a broken path: use the path to this tool instead + TOOLS_PATH=$(dirname "$0") + CHUTNEY_PATH=$(dirname "$TOOLS_PATH") + export CHUTNEY_PATH +fi +if [ -d "$PWD/$CHUTNEY_PATH" ] && [ -x "$PWD/$CHUTNEY_PATH/chutney" ]; then + # looks like a relative path: make chutney path absolute + export CHUTNEY_PATH="$PWD/$CHUTNEY_PATH" +fi + +# Get a working net path +case "$CHUTNEY_DATA_DIR" in + /*) + # if an absolute path, then leave as-is + # chutney will make this directory automatically if needed + ;; + *) + # if a relative path + if [ ! -d "$CHUTNEY_DATA_DIR" ]; then + # looks like a broken path: use the chutney path as a base + export CHUTNEY_DATA_DIR="$CHUTNEY_PATH/net" + fi + if [ -d "$PWD/$CHUTNEY_DATA_DIR" ]; then + # looks like a relative path: make chutney path absolute + export CHUTNEY_DATA_DIR="$PWD/$CHUTNEY_DATA_DIR" + fi + ;; +esac + +# Show the source diagnostics for $CHUTNEY_PATH and $CHUTNEY_DATA_DIR +show_source_diagnostics() { + ## List the permissions on chutney and chutney/net + echo "Showing permissions on '$CHUTNEY_PATH':" + ls -al "$CHUTNEY_PATH" || \ + echo "'$CHUTNEY_PATH' ls failed" + echo + + echo "Showing up to 10 previous nodes directories in '$CHUTNEY_DATA_DIR':" + # We actually want to see the ls output here, not just the file names + # shellcheck disable=SC2012 + ls -al "$CHUTNEY_DATA_DIR" | tail -10 || \ + echo "'$CHUTNEY_DATA_DIR' ls | tail failed" + echo + + echo "Showing up to 50 nodes files, recursively:" + ## List the link and contents of chutney/net/nodes + ls -lR "$CHUTNEY_DATA_DIR/nodes" || \ + echo "'$CHUTNEY_DATA_DIR/nodes' ls failed" + # shellcheck disable=SC2012 + ls -lR "$CHUTNEY_DATA_DIR/nodes/" | head -50 || \ + echo "'$CHUTNEY_DATA_DIR/nodes/' ls failed" + echo +} + +# Show the file $1, including any errors reading it +# Limit each file to 100 lines +show_file() { + if ! test -e "$1"; then + echo "'$1' does not exist" + exit + fi + if ! test -f "$1"; then + echo "'$1' is not a regular file" + exit + fi + if ! test -r "$1"; then + echo "'$1' is not readable" + exit + fi + if ! test -s "$1"; then + echo "'$1' is empty" + exit + fi + + FILE_LINES="$(grep -c "^.*$" "$1")" + echo "'$1' contains $FILE_LINES lines:" + # Use grep, because wc's output formatting varies + if test "$FILE_LINES" -gt 100; then + head -50 "$1" || echo "'$1' head failed" + echo "..." + tail -50 "$1" || echo "'$1' tail failed" + else + cat "$1" || echo "'$1' cat failed" + fi + echo +} + +# Show the contents of all the files in the space-separated list $1 +show_file_list() { + for f in $1; do + show_file "$f" + done +} + +# Show the contents of important files in the node directory $1 +show_node_diagnostics() { + PREV_DIR="$PWD" + if ! cd "$1"; then + echo "cd '$1' failed" + return + fi + + echo "Files for '$1':" + + ## Dump the config + show_file torrc + + ## Dump the important directory documents + #show_file cached-certs + show_file cached-consensus + show_file_list cached-descriptors* + show_file_list cached-extrainfo* + show_file cached-microdesc-consensus + show_file_list cached-microdescs* + #show_file state + + cd "$PREV_DIR" || echo "cd '$PREV_DIR' failed" +} + +# Show the authority diagnostics for $CHUTNEY_DATA_DIR +show_auth_diagnostics() { + PREV_DIR="$PWD" + if ! cd "$CHUTNEY_DATA_DIR"; then + echo "cd '$CHUTNEY_DATA_DIR' failed" + return + fi + + for d in nodes/0*a*; do + echo "Files for authority '$d':" + #show_file "$d/key-pinning-journal" + #show_file "$d/router-stability" + #show_file "$d/sr-state" + show_file "$d/v3-status-votes" + show_file_list "$d/unparseable-descs/"* + done + + cd "$PREV_DIR" || echo "cd '$PREV_DIR' failed" +} + +# Show the usage message for this script +usage() { + echo "Usage: $NAME [node]" + exit 1 +} + +NAME=$(basename "$0") +DEST="$CHUTNEY_DATA_DIR/nodes" + +[ -d "$DEST" ] || { echo "$NAME: no nodes dir at '$DEST'"; exit 1; } +if [ $# -eq 0 ]; +then + show_source_diagnostics + + # there should only be one 000*, but if there's two, we want to see both + echo "Files for the first authority" "$DEST"/000* ":" + for dir in "$DEST"/000*; + do + show_node_diagnostics "$dir" + done + + show_auth_diagnostics +elif [ $# -eq 1 ]; +then + show_source_diagnostics + + [ -e "$DEST/$1" ] || \ + { echo "$NAME: no node at '$DEST/$1'"; exit 1; } + echo "Files for node $DEST/$1:" + show_node_diagnostics "$DEST/$1" + + show_auth_diagnostics +else + usage +fi

1 0

[chutney/master] Travis: Use tools/diagnostics.sh on failure
by teor＠torproject.org 19 Feb '20

19 Feb '20

commit d1430d36c7bd5a1d0f5207bc7b2a27b0a713e33f Author: teor <teor(a)torproject.org> Date: Mon Feb 17 16:45:19 2020 +1000 Travis: Use tools/diagnostics.sh on failure Closes 32792. --- .travis.yml | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 05a688f..1317392 100644 --- a/.travis.yml +++ b/.travis.yml @@ -264,25 +264,10 @@ script: #- tools/test-network.sh --data "$FIVE_MEGABYTES" --connections 2 --rounds 2 --hs-multi-client 1 --start-time 130 --bootstrap-time 70 --stop-time 10 after_failure: - ## List the permissions on chutney and chutney/net - - ls -al . net - ## List the contents of net/nodes - - ls -lR net/nodes/ - ## Dump the config - - cat net/nodes/000a*/torrc - ## Dump the important directory documents - #- cat net/nodes/000a*/cached-certs - - cat net/nodes/000a*/cached-consensus - - cat net/nodes/000a*/cached-descriptors* - #- cat net/nodes/000a*/cached-extrainfo* - - cat net/nodes/000a*/cached-microdesc-consensus - - cat net/nodes/000a*/cached-microdescs* - #- cat net/nodes/000a*/key-pinning-journal - #- cat net/nodes/000a*/router-stability - #- cat net/nodes/00*a*/sr-state - #- cat net/nodes/00*a*/state - - for f in net/nodes/00*a*/v3-status-votes ; do echo "$f"; cat "$f"; done - - for f in net/nodes/00*a*/unparseable-descs/* ; do echo "$f"; cat "$f"; done + ## Show some diagnostics + ## Pass the node name as the first argument, to see detailed diagnostics for + ## a particular node + - tools/diagnostics.sh ## And repeat the warnings at the end - tools/test-network.sh --only-warnings

1 0

[chutney/master] scripts/git: Add a pre-commit git hook
by teor＠torproject.org 19 Feb '20

19 Feb '20

commit 26ca33bb1fa990f57a7bb37371d0a98204f3edad Author: teor <teor(a)torproject.org> Date: Mon Feb 17 16:16:21 2020 +1000 scripts/git: Add a pre-commit git hook This git hook runs the shellcheck tests, and the unit tests. Part of 32792. --- scripts/git/pre-commit.git-hook | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook new file mode 100755 index 0000000..9aa89d2 --- /dev/null +++ b/scripts/git/pre-commit.git-hook @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +# +# To install this script, copy it to .git/hooks/pre-commit in local copy of +# the chutney git repo, and make sure it has permission to execute. +# +# This is pre-commit git hook script that prevents commiting your changeset if +# it fails our shellcheck or unit tests. + +workdir=$(git rev-parse --show-toplevel) + +cd "$workdir" || exit 1 + +set -e + +if [ -e tests/shellcheck-tests.sh ]; then + tests/shellcheck-tests.sh +fi + +if [ -e tests/unit-tests.sh ]; then + tests/unit-tests.sh +fi

1 0

[chutney/master] tools/warnings: Improve comments and tweak output
by teor＠torproject.org 19 Feb '20

19 Feb '20

commit 4283046227dbded23e214cce7df911b773c96698 Author: teor <teor(a)torproject.org> Date: Mon Feb 17 16:44:17 2020 +1000 tools/warnings: Improve comments and tweak output Reformat the comments, add function comments, and improve an error output in tools/warnings.sh. Part of 32792. --- tools/warnings.sh | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/tools/warnings.sh b/tools/warnings.sh index ea82b5a..850bd49 100755 --- a/tools/warnings.sh +++ b/tools/warnings.sh @@ -2,14 +2,25 @@ # # Usage: # tools/warnings.sh [node] -# Output: for each node outputs its warnings and the number of times that -# warning has ocurred. If the argument node is specified, it only shows -# the warnings of that node. -# Examples: tools/warnings.sh -# tools/warnings.sh 000a +# +# Output: +# for each node, show the warnings, and the number of times that warning +# has ocurred. +# +# If the argument "node" is specified, only shows the warnings of that +# node. +# +# Examples: +# tools/warnings.sh +# tools/warnings.sh 000a +# # Environmental variables: -# CHUTNEY_WARNINGS_IGNORE_EXPECTED: set to "true" to filter expected warnings -# CHUTNEY_WARNINGS_SUMMARY: set to "true" to merge warnings from all instances +# +# CHUTNEY_WARNINGS_IGNORE_EXPECTED: +# set to "true" to filter expected warnings +# +# CHUTNEY_WARNINGS_SUMMARY: +# set to "true" to merge warnings from all instances if [ ! -d "$CHUTNEY_PATH" ] || [ ! -x "$CHUTNEY_PATH/chutney" ]; then # looks like a broken path: use the path to this tool instead @@ -41,6 +52,7 @@ case "$CHUTNEY_DATA_DIR" in ;; esac +# Show the warnings for node $1 show_warnings() { # Work out the file and filter settings LOGS=$(mktemp) @@ -90,6 +102,7 @@ show_warnings() { rm "${LOGS}" "${FILTERED_LOGS}" } +# Show the usage message for this script usage() { echo "Usage: $NAME [node]" exit 1 @@ -117,7 +130,7 @@ FILTER='s/^.*\[(warn|err)\]//p' # use the --quiet setting from test-network.sh, if available ECHO_Q=${ECHO:-"echo"} -[ -d "$DEST" ] || { echo "$NAME: no logs available"; exit 1; } +[ -d "$DEST" ] || { echo "$NAME: no logs available in '$DEST'"; exit 1; } if [ $# -eq 0 ]; then if [ "$CHUTNEY_WARNINGS_SUMMARY" = true ]; then

1 0

[chutney/master] shellcheck: Check the pre-commit hook
by teor＠torproject.org 19 Feb '20

19 Feb '20

commit 162d7eb1dad9d37d3c6963b037a82309dfa0a57a Author: teor <teor(a)torproject.org> Date: Mon Feb 17 16:17:50 2020 +1000 shellcheck: Check the pre-commit hook Part of 32792. --- tests/shellcheck-tests.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/shellcheck-tests.sh b/tests/shellcheck-tests.sh index b24a770..84eade8 100755 --- a/tests/shellcheck-tests.sh +++ b/tests/shellcheck-tests.sh @@ -24,3 +24,5 @@ echo "$myname: running shellcheck tests with $EXCLUSIONS" shellcheck "$EXCLUSIONS" chutney find . -name "*.sh" -exec shellcheck "$EXCLUSIONS" {} + + +find . -name "*.git-hook" -exec shellcheck "$EXCLUSIONS" {} +

1 0

[chutney/master] Merge remote-tracking branch 'tor-github/pr/54'
by teor＠torproject.org 19 Feb '20

19 Feb '20

commit 33a534f947686c548966b84d8af425ed288c61fe Merge: 93091c1 37c88af Author: teor <teor(a)torproject.org> Date: Wed Feb 19 10:22:06 2020 +1000 Merge remote-tracking branch 'tor-github/pr/54' .travis.yml | 23 +---- README | 2 + scripts/git/pre-commit.git-hook | 21 +++++ tests/shellcheck-tests.sh | 7 +- tests/unit-tests.sh | 3 +- tools/diagnostics.sh | 194 ++++++++++++++++++++++++++++++++++++++++ tools/test-network-impl.sh | 7 ++ tools/test-network.sh | 31 ++++++- tools/warnings.sh | 29 ++++-- 9 files changed, 284 insertions(+), 33 deletions(-)

1 0

[chutney/master] tests: Make the scripts less verbose
by teor＠torproject.org 19 Feb '20

19 Feb '20

commit 666ac7c6d8357da5829a6abaddb57400500d048f Author: teor <teor(a)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"

1 0

[chutney/master] tools: Add a diagnostics mode to test-network.sh
by teor＠torproject.org 19 Feb '20

19 Feb '20

commit 37c88afccec4817e99ab285ae729b2dcf5c3ae11 Author: teor <teor(a)torproject.org> Date: Mon Feb 17 17:11:45 2020 +1000 tools: Add a diagnostics mode to test-network.sh Like --warnings and --only-warnings, tools/test-network.sh now supports --diagnostics and --only-diagnostics, which run tools/diagnostics.sh. Part of 32792. --- README | 2 ++ tools/test-network-impl.sh | 7 +++++++ tools/test-network.sh | 31 +++++++++++++++++++++++++++++-- 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/README b/README index 0475b2f..9712232 100644 --- a/README +++ b/README @@ -79,6 +79,8 @@ Warning Options: CHUTNEY_WARNINGS_SUMMARY=false --no-warnings CHUTNEY_WARNINGS_SKIP=true --only-warnings CHUTNEY_WARNINGS_ONLY=true + --diagnostics CHUTNEY_DIAGNOSTICS=true + --only-diagnostics CHUTNEY_DIAGNOSTICS_ONLY=true Expert Options: --debug CHUTNEY_DEBUG=true diff --git a/tools/test-network-impl.sh b/tools/test-network-impl.sh index 73b942b..8a8413d 100755 --- a/tools/test-network-impl.sh +++ b/tools/test-network-impl.sh @@ -5,6 +5,7 @@ if ! "$CHUTNEY_PATH/tools/bootstrap-network.sh" "$NETWORK_FLAVOUR"; then $ECHO "SKIP: $NETWORK_FLAVOR not supported." exit 77 fi + "$DIAGNOSTICS" CHUTNEY_WARNINGS_IGNORE_EXPECTED=false CHUTNEY_WARNINGS_SUMMARY=false \ "$WARNING_COMMAND" "$WARNINGS" @@ -35,6 +36,7 @@ if [ "$CHUTNEY_START_TIME" -ge 0 ]; then else $ECHO "Chutney network launched and running. To stop the network, use:" $ECHO "$CHUTNEY stop $CHUTNEY_NETWORK" + "$DIAGNOSTICS" "$WARNINGS" exit 0 fi @@ -47,6 +49,7 @@ if [ "$CHUTNEY_BOOTSTRAP_TIME" -ge 0 ]; then while [ "$n_rounds" -lt "$CHUTNEY_ROUNDS" ]; do n_rounds=$((n_rounds+1)) if ! "$CHUTNEY" verify "$CHUTNEY_NETWORK"; then + "$DIAGNOSTICS" CHUTNEY_WARNINGS_IGNORE_EXPECTED=false \ CHUTNEY_WARNINGS_SUMMARY=false \ "$WARNING_COMMAND" @@ -59,6 +62,7 @@ if [ "$CHUTNEY_BOOTSTRAP_TIME" -ge 0 ]; then else $ECHO "Chutney network ready and running. To stop the network, use:" $ECHO "$CHUTNEY stop $CHUTNEY_NETWORK" + "$DIAGNOSTICS" "$WARNINGS" exit 0 fi @@ -71,6 +75,7 @@ if [ "$CHUTNEY_STOP_TIME" -ge 0 ]; then # work around a bug/feature in make -j2 (or more) # where make hangs if any child processes are still alive if ! "$CHUTNEY" stop "$CHUTNEY_NETWORK"; then + "$DIAGNOSTICS" CHUTNEY_WARNINGS_IGNORE_EXPECTED=false CHUTNEY_WARNINGS_SUMMARY=false \ "$WARNING_COMMAND" "$WARNINGS" @@ -82,9 +87,11 @@ if [ "$CHUTNEY_STOP_TIME" -ge 0 ]; then else $ECHO "Chutney network verified and running. To stop the network, use:" $ECHO "$CHUTNEY stop $CHUTNEY_NETWORK" + "$DIAGNOSTICS" "$WARNINGS" exit 0 fi +"$DIAGNOSTICS" "$WARNINGS" exit 0 diff --git a/tools/test-network.sh b/tools/test-network.sh index 213dab4..d2507b4 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -155,6 +155,14 @@ do --no-warnings) export CHUTNEY_WARNINGS_SKIP=true ;; + # output diagnostics after chutney runs + --diagnostics) + export CHUTNEY_DIAGNOSTICS=true + ;; + # this doesn't run chutney, and only logs diagnostics + --only-diagnostics) + export CHUTNEY_DIAGNOSTICS_ONLY=true + ;; # Expert options # Code Coverage Binary --coverage) @@ -192,9 +200,18 @@ do shift done +if [ "$CHUTNEY_WARNINGS_ONLY" = true ] || \ + [ "$CHUTNEY_DIAGNOSTICS_ONLY" = true ]; then + NETWORK_DRY_RUN=true +fi + +if [ "$CHUTNEY_DIAGNOSTICS_ONLY" = true ]; then + export CHUTNEY_DIAGNOSTICS=true +fi + # If the DNS server doesn't work, tor exits may reject all exit traffic, and # chutney may fail -if [ "$CHUTNEY_WARNINGS_ONLY" != true ]; then +if [ "$NETWORK_DRY_RUN" != true ]; then $ECHO "$myname: using CHUTNEY_DNS_CONF '$CHUTNEY_DNS_CONF'" fi @@ -332,6 +349,13 @@ $ECHO "$myname: Using \$CHUTNEY_TOR: '$CHUTNEY_TOR' and \$CHUTNEY_TOR_GENCERT: ' export NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-"bridges+hs-v23"} export CHUTNEY_NETWORK="$CHUTNEY_PATH/networks/$NETWORK_FLAVOUR" +export DIAGNOSTIC_COMMAND="$CHUTNEY_PATH/tools/diagnostics.sh" +if [ "$CHUTNEY_DIAGNOSTICS" = true ]; then + export DIAGNOSTICS="$DIAGNOSTIC_COMMAND" +else + export DIAGNOSTICS=true +fi + export WARNING_COMMAND="$CHUTNEY_PATH/tools/warnings.sh" if [ "$CHUTNEY_WARNINGS_SKIP" = true ]; then export WARNINGS=true @@ -340,7 +364,10 @@ else fi # And finish up if we're doing a dry run -if [ "$NETWORK_DRY_RUN" = true ] || [ "$CHUTNEY_WARNINGS_ONLY" = true ]; then +if [ "$NETWORK_DRY_RUN" = true ]; then + if [ "$CHUTNEY_DIAGNOSTICS_ONLY" = true ]; then + "$DIAGNOSTICS" + fi if [ "$CHUTNEY_WARNINGS_ONLY" = true ]; then "$WARNINGS" fi

1 0