commit c342c61e8ef0f7d79300054823d788ef1f4af878 Author: Isis Lovecruft <isis@torproject.org> Date: Mon Nov 5 14:02:49 2012 +0000 * Changed runner.getTestOptions() to return the localoptions, in addition to setting them as an attribute. --- ooni/runner.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ooni/runner.py b/ooni/runner.py index d711153..52c6596 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -104,11 +104,13 @@ def getTestOptions(cls, subargs): raise Exception("This test requires root to run") try: - cls.buildOptions(subargs) + local_opts = cls.buildOptions(subargs) except Exception, e: log.err(e) - return cls.local_options + log.debug("getTestOptions: local_options = %s" % local_opts) + + return local_opts def loadTestsAndOptions(classes, config): """ @@ -240,7 +242,6 @@ class ORunner(object): log.debug("ORunner: cases=%s" % type(cases)) log.debug("ORunner: options=%s" % options) - try: first = options.pop(0) except: @@ -258,8 +259,7 @@ class ORunner(object): filename = 'report_'+date.timestamp()+'.yaml' reportFile = open(filename, 'a+') self.reporterFactory = ReporterFactory( - reportFile, testSuite=self.baseSuite(self.cases) - ) + reportFile, testSuite=self.baseSuite(self.cases)) def runWithInputUnit(self, input_unit): idx = 0