commit 94d1260906017f58afabba2d2fefbf1bf4ac394f Author: Isis Lovecruft isis@torproject.org Date: Mon Nov 5 14:01:10 2012 +0000

* There are still bugs in the options parser, and inputs is a listiterater, which also needs to be fixed. --- ooni/nettest.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ooni/nettest.py b/ooni/nettest.py index 94c8c56..84c3289 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -311,6 +311,7 @@ class NetTestAdaptor(unittest.TestCase): setattr(cls, "local_options", options) log.debug("NetTestAdaptor: getTestOptions: cls.local_options = %s" % cls.local_options) + return options

@classmethod def setUpClass(cls): @@ -434,9 +435,11 @@ class NetTestCase(NetTestAdaptor): else: log.debug("could not find cls.localOptions!")

- return {'inputs': self.parsed_inputs, - 'name': self.name, - 'version': self.version} + ret= {'inputs': self.parsed_inputs, + 'name': self.name, + 'version': self.version} + log.debug("%s" % ret) + # if options: # return options # else: