commit 22b58cf7279b3516feda1528092575b0c0f87fee Author: Isis Lovecruft isis@torproject.org Date: Thu Nov 1 08:59:44 2012 +0000

* Fixed whitespace, removed imports, marked another import because it appears to cause errors. --- ooni/plugoo/tests.py | 1 - ooni/runner.py | 4 ++-- ooni/utils/log.py | 1 + 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ooni/plugoo/tests.py b/ooni/plugoo/tests.py index c47e967..653dd67 100644 --- a/ooni/plugoo/tests.py +++ b/ooni/plugoo/tests.py @@ -140,4 +140,3 @@ class OONITest(object): log.msg("Starting test %s" % self.__class__)

return self._do_experiment(args) - diff --git a/ooni/runner.py b/ooni/runner.py index e35ee02..36f5b6e 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -18,10 +18,11 @@ from twisted.trial.runner import isTestCase from twisted.trial.runner import filenameToModule

from ooni.inputunit import InputUnitFactory -from ooni.nettest import InputTestSuite +from ooni.nettest import InputTestSuite, TestCase from ooni.plugoo import tests as oonitests from ooni.reporter import ReporterFactory from ooni.utils import log, date +from ooni.utils.assertions import isClass from ooni.utils.legacy import LegacyOONITest from ooni.utils.legacy import start_legacy_test, adapt_legacy_test

@@ -142,7 +143,6 @@ def processTestOptions(cls, config):

if cls.inputFile: cls.inputFile = opts[cls.inputFile[0]] - """ try: log.debug("%s: trying %s.localoptions.getOptions()..." diff --git a/ooni/utils/log.py b/ooni/utils/log.py index 2b5c1ac..6e99dc6 100644 --- a/ooni/utils/log.py +++ b/ooni/utils/log.py @@ -11,6 +11,7 @@ from twisted.python import log as txlog from twisted.python.logfile import DailyLogFile

from ooni.utils import otime +## error on import with new __init__ file: 31/10/12 from ooni import config

# XXX make this a config option