[tor-commits] [chutney/master] Fix a common Travis failure mode by allowing tor more time to bootstrap

[teor at torproject.org]

commit b0e98fccdcfc6e5db6e4d975c26dfe5c32c139e0
Author: teor <teor at 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}@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