commit 7c5674e2756e0f07436a0f6917eca07d36d55c76 Author: Arturo Filastò hellais@gmail.com Date: Tue Feb 7 23:03:40 2012 +0100

Parametrize timeout in bridge testing --- refactor/ooni-probe.conf | 1 + refactor/tests/bridget.py | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/refactor/ooni-probe.conf b/refactor/ooni-probe.conf index 75302f8..2e22961 100644 --- a/refactor/ooni-probe.conf +++ b/refactor/ooni-probe.conf @@ -51,6 +51,7 @@ keyword_method = http,telnet ### Tor bridge testing

tor_bridges = bridgetests.txt +tor_bridges_timeout = 40

[report] file = report.log diff --git a/refactor/tests/bridget.py b/refactor/tests/bridget.py index 12e3fa1..42dbfdc 100644 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@ -65,6 +65,8 @@ DataDirectory %s

def connect(self, bridge, timeout=None): if not timeout: + if self.config.tests.tor_bridges_timeout: + self.timeout = self.config.tests.tor_bridges_timeout timeout = self.timeout torrc, tordir = self.writetorrc(bridge) cmd = ["tor", "-f", torrc]