[tor-commits] [ooni-probe/master] fixes from comments

[art at torproject.org]

commit 0326e0b7779ce5e0812e3526893969c733394310
Author: Joe Landers <joe at joelanders.net>
Date:   Thu Feb 19 20:36:33 2015 +0100

    fixes from comments
---
 ooni/nettests/blocking/bridge_reachability.py |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py
index cb063ab..864ae2a 100644
--- a/ooni/nettests/blocking/bridge_reachability.py
+++ b/ooni/nettests/blocking/bridge_reachability.py
@@ -146,7 +146,7 @@ class BridgeReachability(nettest.NetTestCase):
                             "installed")
                     self.report['error'] = 'missing-fteproxy'
                     return
-            elif transport_name == 'scramblesuit':
+            elif ['scramblesuit', 'obfs2', 'obfs3'].count(transport_name) > 0:
                 if self.pyobfsproxy_bin:
                     config.ClientTransportPlugin = ("%s exec %s "
                         "--log-min-severity info --log-file %s managed") % \
@@ -169,7 +169,7 @@ class BridgeReachability(nettest.NetTestCase):
                         "installed")
                     self.report['error'] = 'missing-pyobfsproxy'
                     return
-            else: # obfs2, obfs3, obfs4 handled by yawning's go
+            elif transport_name == 'obfs4':
                 if self.obfs4proxy_bin:
                     config.ClientTransportPlugin = ("%s exec %s") % \
                         (transport_name, self.obfs4proxy_bin)
@@ -180,8 +180,13 @@ class BridgeReachability(nettest.NetTestCase):
                     log.err(
                         "Unable to test bridge because obfs4proxy is not "
                         "installed")
-                    self.report['error'] = 'missing-pyobfsproxy'
+                    self.report['error'] = 'missing-obfs4proxy'
                     return
+            else:
+                log.err("Unable to test bridge because we don't handle %s" % \
+                        transport_name)
+                self.report['error'] = 'missing-transport'
+                return
         else:
             self.report['bridge_address'] = self.bridge.split(' ')[0]