[tor-commits] [ooni-probe/master] Set a default bouncer

[art at torproject.org]

commit bc638e8c477b87933cf31bd6f5623a5dfeeb7630
Author: Arturo Filastò <art at fuffa.org>
Date:   Wed Feb 4 14:19:00 2015 +0100

    Set a default bouncer
---
 ooni/report/cli.py  |    2 +-
 ooni/report/tool.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ooni/report/cli.py b/ooni/report/cli.py
index e52b022..c1b4a22 100644
--- a/ooni/report/cli.py
+++ b/ooni/report/cli.py
@@ -20,7 +20,7 @@ class Options(usage.Options):
          "Specify the configuration file to use."],
         ["collector", "c", None,
          "Specify the collector to upload the result to."],
-        ["bouncer", "b", None,
+        ["bouncer", "b", "httpo://nkvphnp3p6agi5qq.onion",
          "Specify the bouncer to query for a collector."]
     ]
 
diff --git a/ooni/report/tool.py b/ooni/report/tool.py
index 9eaad5e..a16794a 100644
--- a/ooni/report/tool.py
+++ b/ooni/report/tool.py
@@ -20,7 +20,7 @@ def upload(report_file, collector=None, bouncer=None):
         report_log = yaml.safe_load(f)
 
     report = parser.ReportLoader(report_file)
-    if bouncer:
+    if bouncer and not collector:
         oonib_client = OONIBClient(bouncer)
         net_tests = [{
             'test-helpers': [],