commit eb25bcd0050eff77d4da017fa00abf5ad3639c57 Author: Isis Lovecruft isis@torproject.org Date: Thu Oct 11 22:19:18 2012 +0000

* Added the config object as a required parameter to ooni.runner.loadTestsAndOptions(), so that config['subArgs'] is accessible by the LegacyOONITest class at instantiation. --- ooni/oonicli.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 40c01fd..ef80c33 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -7,7 +7,7 @@ # oonicli is the next generation ooniprober. It based off of twisted's trial # unit testing framework. # -# :copyright: (c) 2012 by Arturo Filastò +# :copyright: (c) 2012 by Arturo Filastò, Isis Lovecruft # :license: see LICENSE for more details. # # original copyright (c) by Twisted Matrix Laboratories. @@ -106,8 +106,8 @@ def run(): #log.startLoggingWithObserver(logFileObserver.emit, 0)

classes = runner.findTestClassesFromConfig(config) + casesList, options = runner.loadTestsAndOptions(classes, config)

- casesList, options = runner.loadTestsAndOptions(classes) for idx, cases in enumerate(casesList): orunner = runner.ORunner(cases, options[idx], config) orunner.run()