[tor-commits] [ooni-probe/master] Do not set default backends

[art at torproject.org]

commit c2047af6a3c28295d306dc186c7e5b2187a35b03
Author: aagbsn <aagbsn at extc.org>
Date:   Sat Oct 12 14:25:23 2013 +0000

    Do not set default backends
    
    If a valid default backend is specified, the bouncer will not look up test helpers
---
 ooni/nettests/blocking/dnsconsistency.py                     |    2 +-
 ooni/nettests/manipulation/dnsspoof.py                       |    2 +-
 ooni/nettests/manipulation/http_header_field_manipulation.py |    2 +-
 ooni/nettests/manipulation/http_host.py                      |    2 +-
 ooni/nettests/manipulation/http_invalid_request_line.py      |    2 +-
 ooni/nettests/manipulation/traceroute.py                     |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ooni/nettests/blocking/dnsconsistency.py b/ooni/nettests/blocking/dnsconsistency.py
index d883434..1b11d04 100644
--- a/ooni/nettests/blocking/dnsconsistency.py
+++ b/ooni/nettests/blocking/dnsconsistency.py
@@ -26,7 +26,7 @@ from ooni import nettest
 from ooni.utils import log
 
 class UsageOptions(usage.Options):
-    optParameters = [['backend', 'b', '8.8.8.8:53',
+    optParameters = [['backend', 'b', None,
                         'The OONI backend that runs the DNS resolver'],
                      ['testresolvers', 'T', None,
                         'File containing list of DNS resolvers to test against'],
diff --git a/ooni/nettests/manipulation/dnsspoof.py b/ooni/nettests/manipulation/dnsspoof.py
index 598c41f..58465d7 100644
--- a/ooni/nettests/manipulation/dnsspoof.py
+++ b/ooni/nettests/manipulation/dnsspoof.py
@@ -16,7 +16,7 @@ class UsageOptions(usage.Options):
                     'Specify the resolver that should be used for DNS queries (ip:port)'],
                     ['hostname', 'h', None,
                         'Specify the hostname of a censored site'],
-                    ['backend', 'b', '8.8.8.8:53',
+                    ['backend', 'b', None,
                         'Specify the IP address of a good DNS resolver (ip:port)']
                     ]
 
diff --git a/ooni/nettests/manipulation/http_header_field_manipulation.py b/ooni/nettests/manipulation/http_header_field_manipulation.py
index 3423442..49566ae 100644
--- a/ooni/nettests/manipulation/http_header_field_manipulation.py
+++ b/ooni/nettests/manipulation/http_header_field_manipulation.py
@@ -29,7 +29,7 @@ def random_capitalization(string):
 
 class UsageOptions(usage.Options):
     optParameters = [
-            ['backend', 'b', 'http://127.0.0.1:57001', 
+            ['backend', 'b', None,
                 'URL of the backend to use for sending the requests'],
             ['headers', 'h', None,
                 'Specify a yaml formatted file from which to read the request headers to send']
diff --git a/ooni/nettests/manipulation/http_host.py b/ooni/nettests/manipulation/http_host.py
index 2ec517c..41b21f1 100644
--- a/ooni/nettests/manipulation/http_host.py
+++ b/ooni/nettests/manipulation/http_host.py
@@ -15,7 +15,7 @@ from ooni.utils import log
 from ooni.templates import httpt
 
 class UsageOptions(usage.Options):
-    optParameters = [['backend', 'b', 'http://127.0.0.1:57001',
+    optParameters = [['backend', 'b', None,
                       'URL of the test backend to use. Should be \
                               listening on port 80 and be a \
                               HTTPReturnJSONHeadersHelper'],
diff --git a/ooni/nettests/manipulation/http_invalid_request_line.py b/ooni/nettests/manipulation/http_invalid_request_line.py
index 64dbcac..8ba124e 100644
--- a/ooni/nettests/manipulation/http_invalid_request_line.py
+++ b/ooni/nettests/manipulation/http_invalid_request_line.py
@@ -6,7 +6,7 @@ from ooni.utils import randomStr, randomSTR
 from ooni.templates import tcpt
 
 class UsageOptions(usage.Options):
-    optParameters = [['backend', 'b', '127.0.0.1',
+    optParameters = [['backend', 'b', None,
                         'The OONI backend that runs a TCP echo server'],
                     ['backendport', 'p', 80, 'Specify the port that the TCP echo server is running (should only be set for debugging)']]
 
diff --git a/ooni/nettests/manipulation/traceroute.py b/ooni/nettests/manipulation/traceroute.py
index 2db1826..8a17213 100644
--- a/ooni/nettests/manipulation/traceroute.py
+++ b/ooni/nettests/manipulation/traceroute.py
@@ -14,7 +14,7 @@ from ooni.utils import log
 
 class UsageOptions(usage.Options):
     optParameters = [
-                    ['backend', 'b', '8.8.8.8', 'Test backend to use'],
+                    ['backend', 'b', None, 'Test backend to use'],
                     ['timeout', 't', 5, 'The timeout for the traceroute test'],
                     ['maxttl', 'm', 30, 'The maximum value of ttl to set on packets'],
                     ['srcport', 'p', None, 'Set the source port to a specific value (only applies to TCP and UDP)']