[tor-commits] [ooni-probe/master] Fix so that parsing of test decks works properly

[art@xxxxxxxxxxxxxx]

commit 49c442b48ac72420338ede93b2601a74c0f028f5
Author: Arturo Filastò <art@xxxxxxxxx>
Date:   Thu Feb 28 21:05:26 2013 +0100

    Fix so that parsing of test decks works properly
---
 ooni/oonicli.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ooni/oonicli.py b/ooni/oonicli.py
index af06ad2..06aa20c 100644
--- a/ooni/oonicli.py
+++ b/ooni/oonicli.py
@@ -106,8 +106,8 @@ def runWithDirector():
     if global_options['testdeck']:
         test_deck = yaml.safe_load(open(global_options['testdeck']))
         for test in test_deck:
-            test_list.append(NetTestLoader(test['options'],
-                                           test_file=global_options['test_file']))
+            test_list.append(NetTestLoader(test['options']['subargs'],
+                                           test_file=test['options']['test_file']))
     else:
         log.debug("No test deck detected")
         test_list.append(NetTestLoader(global_options['subargs'],



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits