commit 541d3da949a4152bcb7a600ea9efa943ab720a82 Author: Arturo Filastò art@fuffa.org Date: Wed Mar 5 10:16:52 2014 +0100
Improve the output of the bridge reachability test --- ooni/nettests/blocking/bridge_reachability.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index 65e968a..970e477 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ b/ooni/nettests/blocking/bridge_reachability.py @@ -25,7 +25,9 @@ class BridgeReachability(nettest.NetTestCase): usageOptions = UsageOptions
inputFile = ['file', 'f', None, - 'File containing bridges to test reachability for (they should be one per line IP:ORPort)'] + 'File containing bridges to test reachability for. ' + 'They should be one per line IP:ORPort or ' + 'TransportType IP:ORPort (ex. obfs2 127.0.0.1:443)']
requiredOptions = ['file']
@@ -79,12 +81,12 @@ class BridgeReachability(nettest.NetTestCase): progress_updates=updates) @d.addCallback def setup_complete(proto): - log.msg("Success") + log.msg("Successfully connected to %s" % self.bridge) self.report['success'] = True
@d.addErrback def setup_failed(failure): - log.msg("Failed") + log.msg("Failed to connect to %s" % self.bridge) log.exception(failure) self.report['success'] = False