commit c5ac8a46c01d0569b8bb9b69dd20d99fac28e99c
Author: Arturo Filastò <hellais(a)gmail.com>
Date: Fri Feb 10 15:13:49 2012 +0100
Add support for obfs2 obfsproxy bridge testing
---
refactor/ooni-probe.conf | 1 -
refactor/plugoo.py | 2 +-
refactor/tests/bridget.py | 3 ---
3 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/refactor/ooni-probe.conf b/refactor/ooni-probe.conf
index 2e22961..75302f8 100644
--- a/refactor/ooni-probe.conf
+++ b/refactor/ooni-probe.conf
@@ -51,7 +51,6 @@ keyword_method = http,telnet
### Tor bridge testing
tor_bridges = bridgetests.txt
-tor_bridges_timeout = 40
[report]
file = report.log
diff --git a/refactor/plugoo.py b/refactor/plugoo.py
index 1540034..0a41a2c 100644
--- a/refactor/plugoo.py
+++ b/refactor/plugoo.py
@@ -281,7 +281,7 @@ class Plugoo():
print ret
self.report(ret)
- def run(self, assets=None, buffer=10, timeout=100000):
+ def run(self, assets=None, buffer=10, timeout=30):
self.logger.info("Starting %s", self.name)
jobs = []
if assets:
diff --git a/refactor/tests/bridget.py b/refactor/tests/bridget.py
index cb77c89..12e3fa1 100644
--- a/refactor/tests/bridget.py
+++ b/refactor/tests/bridget.py
@@ -52,7 +52,6 @@ ClientTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed
UseBridges 1
bridge %s
DataDirectory %s
-usemicrodescriptors 0
""" % (socksport, bridge, datadir)
try:
@@ -66,8 +65,6 @@ usemicrodescriptors 0
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]