commit 17c2b901fb9ddc06d94406e35d55082ab05955dc Author: Arturo Filastò art@fuffa.org Date: Fri Mar 28 01:58:08 2014 +0100

When we fail write the tor log to the report --- ooni/nettests/blocking/bridge_reachability.py | 3 +++ ooni/utils/onion.py | 1 - 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index d8efb70..d9df317 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ b/ooni/nettests/blocking/bridge_reachability.py @@ -50,6 +50,7 @@ class BridgeReachability(nettest.NetTestCase): self.report['tor_progress'] = 0 self.report['tor_progress_tag'] = None self.report['tor_progress_summary'] = None + self.report['tor_log'] = None self.report['bridge_address'] = None

self.bridge = self.input @@ -130,6 +131,7 @@ class BridgeReachability(nettest.NetTestCase):

config.Bridge = self.bridge config.UseBridges = 1 + config.log = 'notice' config.save()

def updates(prog, tag, summary): @@ -152,6 +154,7 @@ class BridgeReachability(nettest.NetTestCase): @d.addErrback def setup_failed(failure): log.msg("Failed to connect to %s" % self.bridge) + self.report['tor_log'] = failure.value.message self.report['success'] = False

return d diff --git a/ooni/utils/onion.py b/ooni/utils/onion.py index 0c54242..50e20c3 100644 --- a/ooni/utils/onion.py +++ b/ooni/utils/onion.py @@ -9,7 +9,6 @@ from ooni.settings import config class TorVersion(LooseVersion): pass

- def find_tor_binary(): if config.advanced.tor_binary: return config.advanced.tor_binary