[tor-commits] [ooni-probe/master] Convert the deprecated parallelism command line option into an option to output the test deck entry

art at torproject.org art at torproject.org
Fri Jan 3 13:29:42 UTC 2014


commit c0660fb57277b9a2df156a7af9d3ad23d3396857
Author: Arturo Filastò <art at fuffa.org>
Date:   Thu Jan 2 17:24:34 2014 +0100

    Convert the deprecated parallelism command line option into an option to output the test deck entry
---
 ooni/oonicli.py |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ooni/oonicli.py b/ooni/oonicli.py
index 061eab3..ea10f17 100644
--- a/ooni/oonicli.py
+++ b/ooni/oonicli.py
@@ -32,6 +32,7 @@ class Options(usage.Options):
                 ["resume", "r"],
                 ["no-collector", "n"],
                 ["list", "s"],
+                ["printdeck", "p"]
                 ]
 
     optParameters = [["reportfile", "o", None, "report file name"],
@@ -43,7 +44,6 @@ class Options(usage.Options):
                          "Address of the bouncer for test helpers. default: httpo://nkvphnp3p6agi5qq.onion"],
                      ["logfile", "l", None, "log file name"],
                      ["pcapfile", "O", None, "pcap file name"],
-                     ["parallelism", "p", "10", "input parallelism"],
                      ["configfile", "f", None,
                          "Specify a path to the ooniprobe configuration file"],
                      ["datadir", "d", None,
@@ -111,7 +111,7 @@ def runWithDirector():
     config.global_options = global_options
     config.set_paths()
     config.read_config_file()
-
+    
     log.start(global_options['logfile'])
     
     if config.privacy.includepcap:
@@ -132,6 +132,13 @@ def runWithDirector():
             print "  %s" % net_test['description']
 
         sys.exit(0)
+    
+    elif global_options['printdeck']:
+        del global_options['printdeck']
+        print "# Copy and paste the lines below into a test deck to run the specified test with the specified arguments"
+        print yaml.safe_dump([{'options': global_options}]).strip()
+
+        sys.exit(0)
 
     d = director.start()
 





More information about the tor-commits mailing list