March 2019 - tor-commits - lists.torproject.org

[chutney/master] fixup! Add a chutney "wait_until_bootstrap" command
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit da381fff314972abd9cf0d76b6b6912c145e0a35 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 12 09:37:10 2019 -0400 fixup! Add a chutney "wait_until_bootstrap" command Fix a comment typo. --- lib/chutney/TorNet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index c94a4a3..4939840 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -797,7 +797,7 @@ class LocalNodeController(NodeController): return os.path.join(datadir, logname) def getLastBootstrapStatus(self): - """Look through the logs and return the last bootstrapp message + """Look through the logs and return the last bootstrap message received as a 3-tuple of percentage complete, keyword (optional), and message. """

1 0

[chutney/master] wait_for_bootstrap: Make time limit configurable.
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit 9934f8b6d26eee77cc4a6ababca794717c2031b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 12 09:44:38 2019 -0400 wait_for_bootstrap: Make time limit configurable. (Also define a utility function to extract an environment variable as an integer, since we seem to do this a lot, and we are sometimes sloppy about it.) --- lib/chutney/TorNet.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 4939840..5722402 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -37,6 +37,22 @@ torrc_option_warn_count = 0 # Get verbose tracebacks, so we can diagnose better. cgitb.enable(format="plain") +def getenv_int(envvar, default): + """ + Return the value of the environment variable 'envar' as an integer, + or 'default' if no such variable exists. + + Raise ValueError if the environment variable is set, but not to + an integer. + """ + # TODO: Use this function in more places. + strval = os.environ.get(envvar) + if strval is None: + return default + try: + return int(strval) + except ValueError: + raise ValueError("Invalid value for environment variable %s: expected an integer, but got %r"%(envvar,strval)) def mkdir_p(d, mode=448): """Create directory 'd' and all of its parents as needed. Unlike @@ -1151,7 +1167,7 @@ class Network(object): def wait_for_bootstrap(self): print("Waiting for nodes to bootstrap...") - limit = 20 #bootstrap time + limit = getenv_int("CHUTNEY_START_TIME", 20) delay = 0.5 controllers = [n.getController() for n in self._nodes] elapsed = 0.0

1 0

[chutney/master] Fix shellcheck warnings in test-network.sh
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit 95829ce2cf596aa88702d25c73efffe5421a4f32 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 12 08:30:01 2019 -0400 Fix shellcheck warnings in test-network.sh --- tools/test-network.sh | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/tools/test-network.sh b/tools/test-network.sh index 8eb0d6d..ec58e20 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -201,7 +201,7 @@ if [ ! -d "$TOR_DIR" ]; then # But only if it looks like one $ECHO "$myname: \$TOR_DIR not set, trying \$PWD" export TOR_DIR="$PWD" - elif [ -d "$PWD/../tor" -a -d "$PWD/../tor/src/tools" ]; then + elif [ -d "$PWD/../tor" ] && [ -d "$PWD/../tor/src/tools" ]; then # Guess the tor directory is next to the current directory # But only if it looks like one $ECHO "$myname: \$TOR_DIR not set, trying \$PWD/../tor" @@ -214,7 +214,7 @@ fi # Now find the name of the Tor app dir, which changed in Tor 0.3.5 if [ -d "$TOR_DIR" ]; then - if [ -d "$TOR_DIR/src/app" -a -d "$TOR_DIR/src/or" ]; then + if [ -d "$TOR_DIR/src/app" ] && [ -d "$TOR_DIR/src/or" ]; then $ECHO "$myname: \$TOR_DIR has a Tor 0.3.5 or later build directory, and a Tor 0.3.4 or earlier build directory" $ECHO "$myname: Please remove $TOR_DIR/src/app or $TOR_DIR/src/or, or set \$CHUTNEY_TOR" exit 1 @@ -231,30 +231,33 @@ if [ -d "$TOR_DIR" ]; then fi # make TOR_DIR and TOR_APP_DIR absolute -if [ -d "$PWD/$TOR_DIR" -a -d "$PWD/$TOR_APP_DIR" -a \ - -d "$PWD/$TOR_DIR/src/tools" ]; then +if [ -d "$PWD/$TOR_DIR" ] && [ -d "$PWD/$TOR_APP_DIR" ] && \ + [ -d "$PWD/$TOR_DIR/src/tools" ]; then export TOR_DIR="$PWD/$TOR_DIR" export TOR_APP_DIR="$PWD/$TOR_APP_DIR" fi +TOOLS_DIR=$(dirname "$0") + # mandatory: $CHUTNEY_PATH is the path to the chutney launch script # if it's not set: # - if $PWD looks like a chutney directory, set it to $PWD, or # - set it based on $TOR_DIR, expecting chutney to be next to tor, or # - fail and tell the user how to clone the chutney repository -if [ ! -d "$CHUTNEY_PATH" -o ! -x "$CHUTNEY_PATH/chutney" -o \ - ! -f "$CHUTNEY_PATH/chutney" ]; then - if [ -x "$PWD/chutney" -a -f "$PWD/chutney" ]; then +if [ ! -d "$CHUTNEY_PATH" ] || [ ! -x "$CHUTNEY_PATH/chutney" ] || \ + [ ! -f "$CHUTNEY_PATH/chutney" ]; then + if [ -x "$PWD/chutney" ] && [ -f "$PWD/chutney" ]; then $ECHO "$myname: \$CHUTNEY_PATH not valid, trying \$PWD" export CHUTNEY_PATH="$PWD" - elif [ -d "`dirname \"$0\"`/.." -a \ - -x "`dirname \"$0\"`/../chutney" -a \ - -f "`dirname \"$0\"`/../chutney" ]; then + elif [ -d "$TOOLS_DIR/.." ] && \ + [ -x "$TOOLS_DIR)/../chutney" ] && \ + [ -f "$TOOLS_DIR/../chutney" ]; then $ECHO "$myname: \$CHUTNEY_PATH not valid, using this script's location" - export CHUTNEY_PATH="`dirname \"$0\"`/.." - elif [ -d "$TOR_DIR" -a -d "$TOR_DIR/../chutney" -a \ - -x "$TOR_DIR/../chutney/chutney" -a \ - -f "$TOR_DIR/../chutney/chutney" ]; then + export CHUTNEY_PATH="$TOOLS_DIR/.." + elif [ -d "$TOR_DIR" ] && \ + [ -d "$TOR_DIR/../chutney" ] && \ + [ -x "$TOR_DIR/../chutney/chutney" ] && \ + [ -f "$TOR_DIR/../chutney/chutney" ]; then $ECHO "$myname: \$CHUTNEY_PATH not valid, trying \$TOR_DIR/../chutney" export CHUTNEY_PATH="$TOR_DIR/../chutney" else @@ -269,7 +272,7 @@ if [ ! -d "$CHUTNEY_PATH" -o ! -x "$CHUTNEY_PATH/chutney" -o \ fi # make chutney path absolute -if [ -d "$PWD/$CHUTNEY_PATH" -a -x "$PWD/$CHUTNEY_PATH/chutney" ]; then +if [ -d "$PWD/$CHUTNEY_PATH" ] && [ -x "$PWD/$CHUTNEY_PATH/chutney" ]; then export CHUTNEY_PATH="$PWD/$CHUTNEY_PATH" fi @@ -291,7 +294,7 @@ if [ -d "$TOR_DIR" ]; then else if [ -x "$CHUTNEY_TOR" ]; then $ECHO "$myname: Assuming \$CHUTNEY_TOR is a path to a binary" - elif [ ! -z "$CHUTNEY_TOR" ]; then + elif [ -n "$CHUTNEY_TOR" ]; then $ECHO "$myname: Assuming \$CHUTNEY_TOR is a binary name in \$PATH" else $ECHO "$myname: Setting \$CHUTNEY_TOR to the standard binary name in \$PATH" @@ -299,7 +302,7 @@ else fi if [ -x "$CHUTNEY_TOR_GENCERT" ]; then $ECHO "$myname: Assuming \$CHUTNEY_TOR_GENCERT is a path to a binary" - elif [ ! -z "$CHUTNEY_TOR_GENCERT" ]; then + elif [ -n "$CHUTNEY_TOR_GENCERT" ]; then $ECHO "$myname: Assuming \$CHUTNEY_TOR_GENCERT is a binary name in \$PATH" else $ECHO "$myname: Setting \$CHUTNEY_TOR_GENCERT to the standard binary name in \$PATH" @@ -320,7 +323,7 @@ else fi # And finish up if we're doing a dry run -if [ "$NETWORK_DRY_RUN" = true -o "$CHUTNEY_WARNINGS_ONLY" = true ]; then +if [ "$NETWORK_DRY_RUN" = true ] || [ "$CHUTNEY_WARNINGS_ONLY" = true ]; then if [ "$CHUTNEY_WARNINGS_ONLY" = true ]; then "$WARNINGS" fi

1 0

[chutney/master] Extract the body of test-network.sh into a new script.
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit a2bd9bce2f733493fd3e9578f9ee8fc1176b57d0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 12 08:39:38 2019 -0400 Extract the body of test-network.sh into a new script. --- tools/test-network-impl.sh | 79 +++++++++++++++++++++++++++++++++++++++++++ tools/test-network.sh | 84 +++------------------------------------------- 2 files changed, 83 insertions(+), 80 deletions(-) diff --git a/tools/test-network-impl.sh b/tools/test-network-impl.sh new file mode 100755 index 0000000..2de1bfa --- /dev/null +++ b/tools/test-network-impl.sh @@ -0,0 +1,79 @@ +#!/bin/sh + +if ! "$CHUTNEY_PATH/tools/bootstrap-network.sh" "$NETWORK_FLAVOUR"; then + CHUTNEY_WARNINGS_IGNORE_EXPECTED=false CHUTNEY_WARNINGS_SUMMARY=false \ + "$WARNING_COMMAND" + "$WARNINGS" + $ECHO "bootstrap-network.sh failed" + exit 1 +fi + +# chutney starts verifying after 20 seconds, keeps on trying for 60 seconds, +# and then stops immediately (by default) +# Even the fastest chutney networks take 5-10 seconds for their first consensus +# and then 10 seconds after that for relays to bootstrap and upload descriptors +export CHUTNEY_START_TIME=${CHUTNEY_START_TIME:-40} +export CHUTNEY_BOOTSTRAP_TIME=${CHUTNEY_BOOTSTRAP_TIME:-60} +export CHUTNEY_STOP_TIME=${CHUTNEY_STOP_TIME:-0} + +CHUTNEY="$CHUTNEY_PATH/chutney" + +if [ "$CHUTNEY_START_TIME" -ge 0 ]; then + $ECHO "Waiting $CHUTNEY_START_TIME seconds for a consensus containing relays to be generated..." + sleep "$CHUTNEY_START_TIME" +else + $ECHO "Chutney network launched and running. To stop the network, use:" + $ECHO "$CHUTNEY stop $CHUTNEY_NETWORK" + "$WARNINGS" + exit 0 +fi + +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..." + while [ "$n_rounds" -lt "$CHUTNEY_ROUNDS" ]; do + n_rounds=$((n_rounds+1)) + if ! "$CHUTNEY" verify "$CHUTNEY_NETWORK"; then + CHUTNEY_WARNINGS_IGNORE_EXPECTED=false \ + CHUTNEY_WARNINGS_SUMMARY=false \ + "$WARNING_COMMAND" + "$WARNINGS" + $ECHO "chutney verify $n_rounds/$CHUTNEY_ROUNDS failed" + exit 1 + fi + $ECHO "Completed $n_rounds/$CHUTNEY_ROUNDS verify rounds." + done +else + $ECHO "Chutney network ready and running. To stop the network, use:" + $ECHO "$CHUTNEY stop $CHUTNEY_NETWORK" + "$WARNINGS" + exit 0 +fi + +if [ "$CHUTNEY_STOP_TIME" -ge 0 ]; then + if [ "$CHUTNEY_STOP_TIME" -gt 0 ]; then + $ECHO "Waiting $CHUTNEY_STOP_TIME seconds before stopping the network..." + fi + sleep "$CHUTNEY_STOP_TIME" + # 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 + CHUTNEY_WARNINGS_IGNORE_EXPECTED=false CHUTNEY_WARNINGS_SUMMARY=false \ + "$WARNING_COMMAND" + "$WARNINGS" + $ECHO "chutney stop failed" + exit 1 + fi + # Give tor time to exit gracefully + sleep 3 +else + $ECHO "Chutney network verified and running. To stop the network, use:" + $ECHO "$CHUTNEY stop $CHUTNEY_NETWORK" + "$WARNINGS" + exit 0 +fi + +"$WARNINGS" +exit 0 diff --git a/tools/test-network.sh b/tools/test-network.sh index ec58e20..b430694 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -315,11 +315,11 @@ $ECHO "$myname: Using \$CHUTNEY_TOR: '$CHUTNEY_TOR' and \$CHUTNEY_TOR_GENCERT: ' export NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-"bridges+hs-v2"} export CHUTNEY_NETWORK="$CHUTNEY_PATH/networks/$NETWORK_FLAVOUR" -WARNING_COMMAND="$CHUTNEY_PATH/tools/warnings.sh" +export WARNING_COMMAND="$CHUTNEY_PATH/tools/warnings.sh" if [ "$CHUTNEY_WARNINGS_SKIP" = true ]; then - WARNINGS=true + export WARNINGS=true else - WARNINGS="$WARNING_COMMAND" + export WARNINGS="$WARNING_COMMAND" fi # And finish up if we're doing a dry run @@ -333,80 +333,4 @@ if [ "$NETWORK_DRY_RUN" = true ] || [ "$CHUTNEY_WARNINGS_ONLY" = true ]; then exit 0 fi -if ! "$CHUTNEY_PATH/tools/bootstrap-network.sh" "$NETWORK_FLAVOUR"; then - CHUTNEY_WARNINGS_IGNORE_EXPECTED=false CHUTNEY_WARNINGS_SUMMARY=false \ - "$WARNING_COMMAND" - "$WARNINGS" - $ECHO "bootstrap-network.sh failed" - exit 1 -fi - -# chutney starts verifying after 20 seconds, keeps on trying for 60 seconds, -# and then stops immediately (by default) -# Even the fastest chutney networks take 5-10 seconds for their first consensus -# and then 10 seconds after that for relays to bootstrap and upload descriptors -export CHUTNEY_START_TIME=${CHUTNEY_START_TIME:-40} -export CHUTNEY_BOOTSTRAP_TIME=${CHUTNEY_BOOTSTRAP_TIME:-60} -export CHUTNEY_STOP_TIME=${CHUTNEY_STOP_TIME:-0} - -CHUTNEY="$CHUTNEY_PATH/chutney" - -if [ "$CHUTNEY_START_TIME" -ge 0 ]; then - $ECHO "Waiting $CHUTNEY_START_TIME seconds for a consensus containing relays to be generated..." - sleep "$CHUTNEY_START_TIME" -else - $ECHO "Chutney network launched and running. To stop the network, use:" - $ECHO "$CHUTNEY stop $CHUTNEY_NETWORK" - "$WARNINGS" - exit 0 -fi - -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..." - while [ "$n_rounds" -lt "$CHUTNEY_ROUNDS" ]; do - n_rounds=$((n_rounds+1)) - if ! "$CHUTNEY" verify "$CHUTNEY_NETWORK"; then - CHUTNEY_WARNINGS_IGNORE_EXPECTED=false \ - CHUTNEY_WARNINGS_SUMMARY=false \ - "$WARNING_COMMAND" - "$WARNINGS" - $ECHO "chutney verify $n_rounds/$CHUTNEY_ROUNDS failed" - exit 1 - fi - $ECHO "Completed $n_rounds/$CHUTNEY_ROUNDS verify rounds." - done -else - $ECHO "Chutney network ready and running. To stop the network, use:" - $ECHO "$CHUTNEY stop $CHUTNEY_NETWORK" - "$WARNINGS" - exit 0 -fi - -if [ "$CHUTNEY_STOP_TIME" -ge 0 ]; then - if [ "$CHUTNEY_STOP_TIME" -gt 0 ]; then - $ECHO "Waiting $CHUTNEY_STOP_TIME seconds before stopping the network..." - fi - sleep "$CHUTNEY_STOP_TIME" - # 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 - CHUTNEY_WARNINGS_IGNORE_EXPECTED=false CHUTNEY_WARNINGS_SUMMARY=false \ - "$WARNING_COMMAND" - "$WARNINGS" - $ECHO "chutney stop failed" - exit 1 - fi - # Give tor time to exit gracefully - sleep 3 -else - $ECHO "Chutney network verified and running. To stop the network, use:" - $ECHO "$CHUTNEY stop $CHUTNEY_NETWORK" - "$WARNINGS" - exit 0 -fi - -"$WARNINGS" -exit 0 +exec "$CHUTNEY_PATH/tools/test-network-impl.sh"

1 0

[chutney/master] Implement an "allow failures" feature in test-network.sh
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit ea4af7b764ac36cc41de95f21894ed4120abd187 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 12 08:57:34 2019 -0400 Implement an "allow failures" feature in test-network.sh You can either set CHUTNEY_ALLOW_FAILURES or use an --allow-failures command-line option to control this. Chutney will then reattempt the test, from bootstrap through shutdown, until either it succeeds, or until it has failed $CHUTNEY_ALLOW_FAILURES+1 times. The default value is zero, so that default behavior will not change. --- tools/test-network.sh | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/tools/test-network.sh b/tools/test-network.sh index b430694..f28acea 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -15,6 +15,9 @@ export CHUTNEY_WARNINGS_SUMMARY=${CHUTNEY_WARNINGS_SUMMARY:-true} # default to exiting when this script exits export CHUTNEY_CONTROLLING_PID=${CHUTNEY_CONTROLLING_PID:-$$} +# default to allowing zero failures +export CHUTNEY_ALLOW_FAILURES=${CHUTNEY_ALLOW_FAILURES:-0} + # default to no DNS: this is a safe, working default for most users # If a custom test expects DNS, it needs to set CHUTNEY_DNS_CONF export CHUTNEY_DNS_CONF=${CHUTNEY_DNS_CONF:-/dev/null} @@ -158,6 +161,11 @@ do export CHUTNEY_DATA_DIR="$2" shift ;; + # How many failures should we allow? Defaults to 0. + --allow-failures) + export CHUTNEY_ALLOW_FAILURES="$2" + shift + ;; # Try not to say anything (applies only to this script) --quiet) export ECHO=true @@ -333,4 +341,17 @@ if [ "$NETWORK_DRY_RUN" = true ] || [ "$CHUTNEY_WARNINGS_ONLY" = true ]; then exit 0 fi -exec "$CHUTNEY_PATH/tools/test-network-impl.sh" +n_attempts=0 +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" + if "$CHUTNEY_PATH/tools/test-network-impl.sh"; then + $ECHO "==== Chutney succeeded after $n_attempts attempt(s)." + exit 0 + fi +done + +$ECHO "Chutney failed $n_attempts times; we may have a problem here." +exit 1

1 0

[chutney/master] travis: allow up to 1 failure before declaring chutney broken
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit 9ef9cccd993793973eea6555f4de1800682794c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 12 09:00:31 2019 -0400 travis: allow up to 1 failure before declaring chutney broken --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3f8b938..8a140dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -163,7 +163,7 @@ install: - tor --version script: - - tools/test-network.sh + - tools/test-network.sh --allow-failures 1 after_failure: ## List the contents of net/nodes

1 0

[chutney/master] Fix a common Travis failure mode by allowing tor more time to bootstrap
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit b0e98fccdcfc6e5db6e4d975c26dfe5c32c139e0 Author: teor <teor(a)torproject.org> Date: Thu Oct 25 10:15:08 2018 +1000 Fix a common Travis failure mode by allowing tor more time to bootstrap And double the consensus interval. Let's see if a longer consensus interval reduces the failure rate. --- tools/bootstrap-network.sh | 4 ++-- tools/test-network.sh | 2 +- torrc_templates/authority.i | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/bootstrap-network.sh b/tools/bootstrap-network.sh index 404ddb4..bea8cee 100755 --- a/tools/bootstrap-network.sh +++ b/tools/bootstrap-network.sh @@ -54,11 +54,11 @@ echo "$myname: bootstrapping network: $flavour" "$CHUTNEY" configure "$CHUTNEY_NETWORK" "$CHUTNEY" start "$CHUTNEY_NETWORK" -sleep 1 +sleep 3 if ! "$CHUTNEY" status "$CHUTNEY_NETWORK"; then # Try to work out why the start or status command is failing CHUTNEY_DEBUG=1 "$CHUTNEY" start "$CHUTNEY_NETWORK" # Wait a little longer, just in case - sleep 5 + sleep 6 CHUTNEY_DEBUG=1 "$CHUTNEY" status "$CHUTNEY_NETWORK" fi diff --git a/tools/test-network.sh b/tools/test-network.sh index ced7455..8eb0d6d 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -342,7 +342,7 @@ fi # and then stops immediately (by default) # Even the fastest chutney networks take 5-10 seconds for their first consensus # and then 10 seconds after that for relays to bootstrap and upload descriptors -export CHUTNEY_START_TIME=${CHUTNEY_START_TIME:-20} +export CHUTNEY_START_TIME=${CHUTNEY_START_TIME:-40} export CHUTNEY_BOOTSTRAP_TIME=${CHUTNEY_BOOTSTRAP_TIME:-60} export CHUTNEY_STOP_TIME=${CHUTNEY_STOP_TIME:-0} diff --git a/torrc_templates/authority.i b/torrc_templates/authority.i index 1bf2561..e307bf5 100644 --- a/torrc_templates/authority.i +++ b/torrc_templates/authority.i @@ -16,11 +16,11 @@ ContactInfo auth${nodenum}(a)test.test # Mixed 0.3.3 and 0.3.4 networks are unstable, due to timing changes. # When all 0.3.3 and earlier versions are obsolete, we may be able to revert to # TestingV3AuthInitialVotingInterval 5 -TestingV3AuthInitialVotingInterval 10 -TestingV3AuthInitialVoteDelay 2 -TestingV3AuthInitialDistDelay 2 +TestingV3AuthInitialVotingInterval 20 +TestingV3AuthInitialVoteDelay 4 +TestingV3AuthInitialDistDelay 4 # Vote + Dist must be less than Interval/2, because when there's no consensus, # tor uses Interval/2 as the voting interval -V3AuthVotingInterval 10 -V3AuthVoteDelay 2 -V3AuthDistDelay 2 +V3AuthVotingInterval 20 +V3AuthVoteDelay 4 +V3AuthDistDelay 4

1 0

[chutney/master] Travis: Trusty no longer exists on deb.tpo -- use Xenial instead
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit e5f6c305ed9220974a48065ffd2e6326da7f2e8a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 28 12:09:41 2019 -0500 Travis: Trusty no longer exists on deb.tpo -- use Xenial instead And fix up a deb.tpo comment. --- .travis.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d8ba66..8f293a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ matrix: - addons: apt: sources: - - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.2.9.x-trusty main' + - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.2.9.x-xenial main' key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - tor @@ -28,18 +28,18 @@ matrix: - addons: apt: sources: - - sourceline: 'deb https://deb.torproject.org/torproject.org trusty main' + - sourceline: 'deb https://deb.torproject.org/torproject.org xenial main' key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' - - sourceline: 'deb https://deb.torproject.org/torproject.org tor-experimental-0.3.5.x-trusty main' + - sourceline: 'deb https://deb.torproject.org/torproject.org tor-experimental-0.3.5.x-xenial main' packages: - tor env: TOR_VERSION="0.3.5" - addons: apt: sources: - - sourceline: 'deb https://deb.torproject.org/torproject.org trusty main' + - sourceline: 'deb https://deb.torproject.org/torproject.org xenial main' key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' - - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-master-trusty main' + - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-master-xenial main' packages: - tor env: TOR_VERSION="nightly" @@ -48,12 +48,12 @@ matrix: - python: "3.4" - python: "3.5" - python: "3.6" - ## Travis Trusty doesn't support these versions + ## TODO: check if Travis Xenial supports these versions #- python: "3.7" #- python: "3.8-dev" - python: "nightly" # PyPy versions - ## Travis Trusty doesn't support these versions + ## TODO: check if Travis Xenial supports these versions #- python: "pypy2.7" - python: "pypy3.5" @@ -74,8 +74,9 @@ matrix: ## sudo; otherwise, we would need it for getting dependencies.) sudo: false -## (Linux only) Use the latest Linux image (Ubuntu Trusty) -dist: trusty +## (Linux only) Use the Ubuntu Xenial Linux Image +## deb.torproject.org doesn't support Trusty any more +dist: xenial ## (OSX only) Use the default OSX image ## See https://docs.travis-ci.com/user/reference/osx#os-x-version @@ -92,9 +93,9 @@ addons: ## (Linux only) apt: sources: - ## Trusty has Tor 0.2.4, so we need a newer version of Tor from the - ## torproject repositories, and the torproject key from the keyservers - - sourceline: 'deb https://deb.torproject.org/torproject.org trusty main' + ## Xenial has Tor 0.2.7, so we need a newer version of Tor from the + ## torproject repositories, and the torproject key from deb.tpo + - sourceline: 'deb https://deb.torproject.org/torproject.org xenial main' key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - tor

1 0

[chutney/master] Travis: Improve Tor and Python version displays in the UI
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit 3754fb4d172dff57f8f0f2238e43d936f335aec9 Author: teor <teor(a)torproject.org> Date: Tue Mar 12 13:20:15 2019 +1000 Travis: Improve Tor and Python version displays in the UI --- .travis.yml | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index c8981ea..f78a387 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,9 @@ language: python +# The default python version on Travis is 2.7 +# But we add this line to show the python version in the Travis UI +python: "2.7" + os: - linux ## We add a single macOS build below @@ -8,14 +12,17 @@ matrix: # include creates Linux, python 2.7, tor stable builds by default # the key(s) in each item override these defaults include: - ## Test macOS with its default python version, and work around an issue - ## with language: python on Travis macOS + ## Test macOS with its default python version, which is currently 2.7. + ## (But we don't show the version, because Travis might change it without + ## us noticing.) + ## Use language: c to work around an issue with language: python on macOS. ## We get the tor version in the homebrew cache on the macOS image ## The current tor version in homebrew is on this page: ## https://formulae.brew.sh/formula/tor - os: osx language: c - env: TOR_VERSION="stable-release" + python: + env: TOR="stable-release" ## Test tor lts, stable, alpha, and nightly ## Standard dpkg configs fall back to stable when newer ## repositories are removed. But we want to fail, so we notice and @@ -30,7 +37,7 @@ matrix: key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - tor - env: TOR_VERSION="0.2.9-nightly" + env: TOR="0.2.9-nightly" - addons: apt: sources: @@ -38,7 +45,7 @@ matrix: key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - tor - env: TOR_VERSION="0.3.5-nightly" + env: TOR="0.3.5-nightly" - addons: apt: sources: @@ -46,7 +53,7 @@ matrix: key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - tor - env: TOR_VERSION="master-nightly" + env: TOR="master-nightly" ## Test all supported python releases - python: "2.7" - python: "3.4" @@ -71,7 +78,7 @@ matrix: ## These builds fail in Travis at the moment #allow_failures: - # - env: TOR_VERSION="master-nightly" + # - env: TOR="master-nightly" ## We don't need sudo. (The "apt:" stanza after this allows us to not need ## sudo; otherwise, we would need it for getting dependencies.) @@ -89,7 +96,7 @@ dist: xenial ## This env var isn't used by the build, but it's useful for debugging ## It should be kept in sync with the Linux tor version below env: - - TOR_VERSION="stable-release" + - TOR="stable-release" ## Download our dependencies addons:

1 0

[chutney/master] Travis: Use deb.torproject.org key URL
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit 61eb4aac524c28a8787d3a5b205e5021873d65c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 28 11:09:17 2019 -0500 Travis: Use deb.torproject.org key URL The old URL produces an object that's way too long, because of all the signatures. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 464fde0..6d8ba66 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ matrix: apt: sources: - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.2.9.x-trusty main' - key_url: 'http://ha.pool.sks-keyservers.net/pks/lookup?search=0xA3C4F0F979CAA22CDBA8F…' + key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - tor env: TOR_VERSION="0.2.9" @@ -29,7 +29,7 @@ matrix: apt: sources: - sourceline: 'deb https://deb.torproject.org/torproject.org trusty main' - key_url: 'http://ha.pool.sks-keyservers.net/pks/lookup?search=0xA3C4F0F979CAA22CDBA8F…' + key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' - sourceline: 'deb https://deb.torproject.org/torproject.org tor-experimental-0.3.5.x-trusty main' packages: - tor @@ -38,7 +38,7 @@ matrix: apt: sources: - sourceline: 'deb https://deb.torproject.org/torproject.org trusty main' - key_url: 'http://ha.pool.sks-keyservers.net/pks/lookup?search=0xA3C4F0F979CAA22CDBA8F…' + key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-master-trusty main' packages: - tor @@ -95,7 +95,7 @@ addons: ## Trusty has Tor 0.2.4, so we need a newer version of Tor from the ## torproject repositories, and the torproject key from the keyservers - sourceline: 'deb https://deb.torproject.org/torproject.org trusty main' - key_url: 'http://ha.pool.sks-keyservers.net/pks/lookup?search=0xA3C4F0F979CAA22CDBA8F…' + key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - tor ## (macOS only)

1 0