[tor-commits] [ooni-probe/master] Increase the default timeout to 2 minutes

[art at torproject.org]

commit cb75aef207d08b2eea5668ab9485d001f9b9d2f7
Author: Arturo Filastò <art at fuffa.org>
Date:   Mon Mar 10 01:06:50 2014 +0100

    Increase the default timeout to 2 minutes
---
 ooni/nettests/blocking/bridge_reachability.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py
index 8e15f44..7742629 100644
--- a/ooni/nettests/blocking/bridge_reachability.py
+++ b/ooni/nettests/blocking/bridge_reachability.py
@@ -13,7 +13,7 @@ from ooni.utils import log
 from ooni import nettest
 
 class UsageOptions(usage.Options):
-    optParameters = [['timeout', 't', 60,
+    optParameters = [['timeout', 't', 120,
                       'Specify the timeout after which to consider the Tor bootstrapping process to have failed'],
                     ]
 
@@ -89,7 +89,6 @@ class BridgeReachability(nettest.NetTestCase):
         @d.addErrback
         def setup_failed(failure):
             log.msg("Failed to connect to %s" % self.bridge)
-            log.exception(failure)
             self.report['success'] = False
 
         return d