March 2013 - tor-commits - lists.torproject.org

[ooni-probe/master] Implement and unittest code for tasks that timeout
by isis＠torproject.org 10 Mar '13

10 Mar '13

commit ba8fb7ce88d179bf7f3ae09017b6ec3b5eca3f96 Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Jan 13 00:09:17 2013 +0100 Implement and unittest code for tasks that timeout --- ooni/tasks.py | 19 +++++++----- tests/test_managers.py | 78 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 80 insertions(+), 17 deletions(-) diff --git a/ooni/tasks.py b/ooni/tasks.py index 703aec3..3230732 100644 --- a/ooni/tasks.py +++ b/ooni/tasks.py @@ -21,10 +21,10 @@ class BaseTask(object): return result def start(self): - d = self.run() - d.addErrback(self._failed) - d.addCallback(self._succeeded) - return d + self.running = self.run() + self.running.addErrback(self._failed) + self.running.addCallback(self._succeeded) + return self.running def succeeded(self, result): """ @@ -50,13 +50,17 @@ class TaskTimedOut(Exception): class TaskWithTimeout(BaseTask): timeout = 5 + # So that we can test the callLater calls + clock = reactor def _timedOut(self): """Internal method for handling timeout failure""" self.timedOut() + self.running.errback(TaskTimedOut) def _cancelTimer(self): - if self._timer: + #import pdb; pdb.set_trace() + if self._timer.active(): self._timer.cancel() def _succeeded(self, result): @@ -68,9 +72,8 @@ class TaskWithTimeout(BaseTask): return BaseTask._failed(self, failure) def start(self): - self._timer = reactor.callLater(self.timeout, self._timedOut) - d = BaseTask.start(self) - return d + self._timer = self.clock.callLater(self.timeout, self._timedOut) + return BaseTask.start(self) def timedOut(self): """ diff --git a/tests/test_managers.py b/tests/test_managers.py index a10933e..d4ee2b5 100644 --- a/tests/test_managers.py +++ b/tests/test_managers.py @@ -1,6 +1,6 @@ from twisted.trial import unittest from twisted.python import failure -from twisted.internet import defer +from twisted.internet import defer, task from ooni.tasks import BaseTask, TaskWithTimeout from ooni.managers import TaskManager, MeasurementManager @@ -26,6 +26,17 @@ class MockSuccessTaskWithTimeout(TaskWithTimeout): def run(self): return defer.succeed(42) +class MockFailTaskThatTimesOut(TaskWithTimeout): + def run(self): + return defer.Deferred() + +class MockTimeoutOnceTask(TaskWithTimeout): + def run(self): + if self.failures >= 1: + return defer.succeed(42) + else: + return defer.Deferred() + class MockFailTaskWithTimeout(TaskWithTimeout): def run(self): return defer.fail(mockFailure) @@ -48,7 +59,9 @@ class TestTaskManager(unittest.TestCase): self.measurementManager.start() - def schedule_failing_tasks(self, task_type, number=1): + self.clock = task.Clock() + + def schedule_successful_tasks(self, task_type, number=1): all_done = [] for x in range(number): mock_task = task_type() @@ -58,15 +71,13 @@ class TestTaskManager(unittest.TestCase): d = defer.DeferredList(all_done) @d.addCallback def done(res): - # 10*2 because 2 is the number of retries - self.assertEqual(len(self.measurementManager.failures), number*3) - for task_result, task_instance in self.measurementManager.failures: - self.assertEqual(task_result, mockFailure) + for task_result, task_instance in self.measurementManager.successes: + self.assertEqual(task_result, 42) self.assertIsInstance(task_instance, task_type) return d - def schedule_successful_tasks(self, task_type, number=1): + def schedule_failing_tasks(self, task_type, number=1): all_done = [] for x in range(number): mock_task = task_type() @@ -76,8 +87,10 @@ class TestTaskManager(unittest.TestCase): d = defer.DeferredList(all_done) @d.addCallback def done(res): - for task_result, task_instance in self.measurementManager.successes: - self.assertEqual(task_result, 42) + # 10*2 because 2 is the number of retries + self.assertEqual(len(self.measurementManager.failures), number*3) + for task_result, task_instance in self.measurementManager.failures: + self.assertEqual(task_result, mockFailure) self.assertIsInstance(task_instance, task_type) return d @@ -88,6 +101,53 @@ class TestTaskManager(unittest.TestCase): def test_schedule_successful_one_task_with_timeout(self): return self.schedule_successful_tasks(MockSuccessTaskWithTimeout) + def test_schedule_failing_tasks_that_timesout(self): + self.measurementManager.retries = 0 + + task_type = MockFailTaskThatTimesOut + task_timeout = 5 + + mock_task = task_type() + mock_task.timeout = task_timeout + mock_task.clock = self.clock + + self.measurementManager.schedule(mock_task) + + self.clock.advance(task_timeout) + + @mock_task.done.addBoth + def done(res): + self.assertEqual(len(self.measurementManager.failures), 1) + for task_result, task_instance in self.measurementManager.failures: + self.assertIsInstance(task_instance, task_type) + + return mock_task.done + + def test_schedule_time_out_once(self): + task_type = MockTimeoutOnceTask + task_timeout = 5 + + mock_task = task_type() + mock_task.timeout = task_timeout + mock_task.clock = self.clock + + self.measurementManager.schedule(mock_task) + + self.clock.advance(task_timeout) + + @mock_task.done.addBoth + def done(res): + self.assertEqual(len(self.measurementManager.failures), 1) + for task_result, task_instance in self.measurementManager.failures: + self.assertIsInstance(task_instance, task_type) + + for task_result, task_instance in self.measurementManager.successes: + self.assertEqual(task_result, 42) + self.assertIsInstance(task_instance, task_type) + + return mock_task.done + + def test_schedule_failing_one_task(self): return self.schedule_failing_tasks(MockFailTask)

1 0

[ooni-probe/master] Move parseNetTestOptions to oonicli
by isis＠torproject.org 10 Mar '13

10 Mar '13

commit 9f1d820721d52a5d1f2e8aa00d3980e9c42226dd Author: aagbsn <aagbsn(a)extc.org> Date: Sun Jan 13 10:34:38 2013 +0000 Move parseNetTestOptions to oonicli --- ooni/oonicli.py | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 4a638e0..d345a25 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -72,6 +72,28 @@ class Options(usage.Options): except: raise usage.UsageError("No test filename specified!") +def parseNetTestOptions(obj, argv): + if not hasattr(obj.usageOptions, 'optParameters'): + obj.usageOptions.optParameters = [] + + if obj.inputFile: + obj.usageOptions.optParameters.append(obj.inputFile) + + if obj.baseParameters: + for parameter in obj.baseParameters: + obj.usageOptions.optParameters.append(parameter) + + if obj.baseFlags: + if not hasattr(obj.usageOptions, 'optFlags'): + obj.usageOptions.optFlags = [] + for flag in obj.baseFlags: + obj.usageOptions.optFlags.append(flag) + + options = obj.usageOptions() + options.parseOptions(argv) + + return options + def updateStatusBar(): for test_filename in config.state.keys(): # The ETA is not updated so we we will not print it out for the

1 0

[ooni-probe/master] Load NetTests from strings
by isis＠torproject.org 10 Mar '13

10 Mar '13

commit 423d3d6882b8945be915162e54a914c49b393fd7 Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Jan 13 12:55:38 2013 +0100 Load NetTests from strings This is achieved by converting the string to a StringIO --- ooni/nettest.py | 26 +++++++++++++++++--------- tests/test_nettest.py | 24 ++++++++++++++++++++---- 2 files changed, 37 insertions(+), 13 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index 5c2e8cf..c9e2ed3 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -9,6 +9,9 @@ from ooni.utils import log, checkForRoot, NotRootError from inspect import getmembers from StringIO import StringIO +class NoTestCasesFound(Exception): + pass + class NetTest(object): director = None method_prefix = 'test' @@ -33,7 +36,7 @@ class NetTest(object): """ raise NotImplementedError - def loadNetTest(self, net_test_object): + def loadNetTest(self, net_test_file): """ Creates all the necessary test_cases (a list of tuples containing the NetTestCase (test_class, test_method)) @@ -50,23 +53,28 @@ class NetTest(object): Note: the inputs must be valid for test_classA and test_classB. - net_test_object: - is a file like object that will be used to generate the test_cases. + net_test_file: + is either a file path or a file like object that will be used to + generate the test_cases. """ + test_cases = None try: - if os.path.isfile(net_test_object): - test_cases = self._loadNetTestFile(net_test_object) + if os.path.isfile(net_test_file): + test_cases = self._loadNetTestFile(net_test_file) + else: + net_test_file = StringIO(net_test_file) + raise TypeError("not a file path") + except TypeError: - if isinstance(net_test_object, StringIO) or \ - isinstance(net_test_object, str): - test_cases = self._loadNetTestString(net_test_object) + if hasattr(net_test_file, 'read'): + test_cases = self._loadNetTestFromFileObject(net_test_file) if not test_cases: raise NoTestCasesFound return test_cases - def _loadNetTestString(self, net_test_string): + def _loadNetTestFromFileObject(self, net_test_string): """ Load NetTest from a string """ diff --git a/tests/test_nettest.py b/tests/test_nettest.py index 0c91a9e..f2d4c6f 100644 --- a/tests/test_nettest.py +++ b/tests/test_nettest.py @@ -51,7 +51,6 @@ class DummyTestCase(NetTestCase): self.report['foo'] = 'foo' """ - #XXX you should actually implement this net_test_with_required_option = net_test_string @@ -132,7 +131,25 @@ class TestNetTest(unittest.TestCase): os.unlink(net_test_file) - def test_load_net_test_from_string(self): + def test_load_net_test_from_str(self): + """ + Given a file like object verify that the net test cases are properly + generated. + """ + net_test_from_string = NetTest(net_test_string, + dummyOptions, DummyReporter()) + + test_methods = set() + for test_class, test_method in net_test_from_string.test_cases: + instance = test_class() + c = getattr(instance, test_method) + self.assertCallable(c) + + test_methods.add(test_method) + + self.assertEqual(set(['test_a', 'test_b']), test_methods) + + def test_load_net_test_from_StringIO(self): """ Given a file like object verify that the net test cases are properly generated. @@ -199,8 +216,7 @@ class TestNetTest(unittest.TestCase): dummyOptionsWithFile, None) measurements = list(net_test.generateMeasurements()) - self.assertEqual(len(measuremenets), 20) - + self.assertEqual(len(measurements), 20) def dd_test_require_root_succeed(self): n = NetTest(StringIO(net_test_root_required),

1 0

[ooni-probe/master] Refactoring of NetTestCase and NetTest with partial unittesting
by isis＠torproject.org 10 Mar '13

10 Mar '13

commit 376715a8350a0a52c57a2fa6f8d68b5d37eafb8d Author: aagbsn <aagbsn(a)extc.org> Date: Sun Jan 13 00:56:20 2013 +0000 Refactoring of NetTestCase and NetTest with partial unittesting --- ooni/nettest.py | 123 ++++++++++++++----------------------------------- tests/test_nettest.py | 92 +++++++++++++++++++++++++++++++------ 2 files changed, 113 insertions(+), 102 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index 511c3da..5c2e8cf 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -4,7 +4,7 @@ from twisted.trial.runner import filenameToModule from twisted.python import usage, reflect from ooni.tasks import Measurement -from ooni.utils import log +from ooni.utils import log, checkForRoot, NotRootError from inspect import getmembers from StringIO import StringIO @@ -13,23 +13,20 @@ class NetTest(object): director = None method_prefix = 'test' - def __init__(self, net_test_file, inputs, options, report): + def __init__(self, net_test_file, options, report): """ net_test_file: is a file object containing the test to be run. - inputs: - is a generator containing the inputs to the net test. - options: is a dict containing the options to be passed to the net test. """ - self.test_cases = self.loadNetTest(net_test_file) - self.inputs = inputs self.options = options - self.report = report + self.test_cases = self.loadNetTest(net_test_file) + self.setUpNetTestCases() + def start(self): """ Start tests and generate measurements. @@ -115,85 +112,30 @@ class NetTest(object): This is a generator that yields measurements and sets their timeout value and their netTest attribute. """ - for test_input in self.inputs: - for test_class, test_method in self.test_cases: - measurement = Measurement(test_class, test_method, test_input) + for test_class, test_method in self.test_cases: + for test_input in test_class.inputs: + measurement = Measurement(test_class, test_method, + test_input, self) measurement.netTest = self yield measurement - def processTestCasesOptions(self): - self.options #XXX is this cmd_line_options? - - # get set of unique classes + def setUpNetTestCases(self): + """ + Call processTest and processOptions methods of each NetTestCase + """ test_classes = set([]) for test_class, test_method in self.test_cases: test_classes.add(test_class) - #XXX where should the options bound to a test_class get stashed? - for test_class in test_classes: - options = self._processOptions() - - #XXX: is options passed to init the same as cmd_line_options??? - def _processTest(self, nettest_test_case, cmd_line_options): - """ - Process the parameters and :class:`twisted.python.usage.Options` of a - :class:`ooni.nettest.Nettest`. - - :param obj: - An uninstantiated old test, which should be a subclass of - :class:`ooni.plugoo.tests.OONITest`. - - :param cmd_line_options: - A configured and instantiated :class:`twisted.python.usage.Options` - class. - - """ - obj = nettest_test_case - if not hasattr(obj.usageOptions, 'optParameters'): - obj.usageOptions.optParameters = [] - - if obj.inputFile: - obj.usageOptions.optParameters.append(obj.inputFile) - - if obj.baseParameters: - for parameter in obj.baseParameters: - obj.usageOptions.optParameters.append(parameter) - - if obj.baseFlags: - if not hasattr(obj.usageOptions, 'optFlags'): - obj.usageOptions.optFlags = [] - for flag in obj.baseFlags: - obj.usageOptions.optFlags.append(flag) - - options = obj.usageOptions() + for klass in test_classes: + klass.localOptions = self.options - options.parseOptions(cmd_line_options['subargs']) - obj.localOptions = options - - if obj.inputFile: - obj.inputFilename = options[obj.inputFile[0]] - - try: - log.debug("processing options") - tmp_test_case_object = obj() - tmp_test_case_object._checkRequiredOptions() - - except usage.UsageError, e: - test_name = tmp_test_case_object.name - log.err("There was an error in running %s!" % test_name) - log.err("%s" % e) - options.opt_help() - raise usage.UsageError("Error in parsing command line args for %s" % test_name) - - # who checks for root? - if obj.requiresRoot: - try: + test_instance = klass() + if test_instance.requiresRoot: checkForRoot() - except NotRootError: - log.err("%s requires root to run" % obj.name) - sys.exit(1) + test_instance._checkRequiredOptions() - return obj + klass.inputs = test_instance.getInputProcessor() class NetTestCase(object): """ @@ -317,16 +259,16 @@ class NetTestCase(object): else: pass - def _checkRequiredOptions(self): - for required_option in self.requiredOptions: - log.debug("Checking if %s is present" % required_option) - if not self.localOptions[required_option]: - raise usage.UsageError("%s not specified!" % required_option) + def getInputProcessor(self): + """ + This method must be called afterr + """ + if self.inputFile: + self.inputFilename = self.localOptions[self.inputFile[0]] - def _processOptions(self): - if self.inputFilename: inputProcessor = self.inputProcessor inputFilename = self.inputFilename + class inputProcessorIterator(object): """ Here we convert the input processor generator into an iterator @@ -334,11 +276,16 @@ class NetTestCase(object): """ def __iter__(self): return inputProcessor(inputFilename) - self.inputs = inputProcessorIterator() - return {'inputs': self.inputs, - 'name': self.name, 'version': self.version - } + return inputProcessorIterator() + + return iter(()) + + def _checkRequiredOptions(self): + for required_option in self.requiredOptions: + log.debug("Checking if %s is present" % required_option) + if not self.localOptions[required_option]: + raise usage.UsageError("%s not specified!" % required_option) def __repr__(self): return "<%s inputs=%s>" % (self.__class__, self.inputs) diff --git a/tests/test_nettest.py b/tests/test_nettest.py index 6ef214c..0c91a9e 100644 --- a/tests/test_nettest.py +++ b/tests/test_nettest.py @@ -8,15 +8,17 @@ from twisted.internet import defer, reactor from ooni.nettest import NetTest, InvalidOption, MissingRequiredOption from ooni.nettest import FailureToLoadNetTest from ooni.tasks import BaseTask +from ooni.utils import NotRootError net_test_string = """ from twisted.python import usage from ooni.nettest import NetTestCase class UsageOptions(usage.Options): - optParameters = [['spam', 's', 'ham']] + optParameters = [['spam', 's', None, 'ham']] class DummyTestCase(NetTestCase): + usageOptions = UsageOptions def test_a(self): @@ -30,6 +32,26 @@ net_test_root_required = net_test_string+""" requiresRoot = True """ +net_test_string_with_file = """ +from twisted.python import usage +from ooni.nettest import NetTestCase + +class UsageOptions(usage.Options): + optParameters = [['spam', 's', None, 'ham']] + +class DummyTestCase(NetTestCase): + inputFile = ['file', 'f', None, 'The input File'] + + usageOptions = UsageOptions + + def test_a(self): + self.report['bar'] = 'bar' + + def test_b(self): + self.report['foo'] = 'foo' +""" + + #XXX you should actually implement this net_test_with_required_option = net_test_string @@ -60,7 +82,7 @@ class DummyMeasurementFailOnce(BaseTask): class DummyNetTest(NetTest): def __init__(self, num_measurements=1): - NetTest.__init__(self, StringIO(net_test_string), dummyInputs, dummyOptions) + NetTest.__init__(self, StringIO(net_test_string), dummyOptions) self.num_measurements = num_measurements def generateMeasurements(self): for i in range(self.num_measurements): @@ -77,6 +99,11 @@ class DummyReporter(object): pass class TestNetTest(unittest.TestCase): + def setUp(self): + with open('dummyInputFile.txt', 'w') as f: + for i in range(10): + f.write("%s\n" % i) + def assertCallable(self, thing): self.assertIn('__call__', dir(thing)) @@ -90,7 +117,7 @@ class TestNetTest(unittest.TestCase): f.write(net_test_string) f.close() - net_test_from_file = NetTest(net_test_file, dummyInputs, + net_test_from_file = NetTest(net_test_file, dummyOptions, DummyReporter()) test_methods = set() @@ -111,7 +138,7 @@ class TestNetTest(unittest.TestCase): generated. """ net_test_from_string = NetTest(StringIO(net_test_string), - dummyInputs, dummyOptions, DummyReporter()) + dummyOptions, DummyReporter()) test_methods = set() for test_class, test_method in net_test_from_string.test_cases: @@ -123,9 +150,13 @@ class TestNetTest(unittest.TestCase): self.assertEqual(set(['test_a', 'test_b']), test_methods) - def test_load_with_option(self): - self.assertIsInstance(NetTest(StringIO(net_test_string), - dummyInputs, dummyOptions, None), NetTest) + def dd_test_load_with_option(self): + net_test = NetTest(StringIO(net_test_string), + dummyOptions, None) + + self.assertIsNotNone(net_test.usageOptions) + self.assertIsNotNone(net_test.usageOptions.optParameters) + self.assertIsInstance(net_test, NetTest) #def test_load_with_invalid_option(self): # #XXX: raises TypeError?? @@ -134,7 +165,7 @@ class TestNetTest(unittest.TestCase): def test_load_with_required_option(self): self.assertIsInstance(NetTest(StringIO(net_test_with_required_option), - dummyInputs, dummyOptionsWithRequiredOptions, None), NetTest) + dummyOptionsWithRequiredOptions, None), NetTest) #def test_load_with_missing_required_option(self): # #XXX: raises TypeError @@ -142,15 +173,48 @@ class TestNetTest(unittest.TestCase): # NetTest(StringIO(net_test_with_required_option), dummyInputs, # dummyOptions, None)) - def test_require_root_succeed(self): - #XXX: make root succeed - NetTest(StringIO(net_test_root_required), - dummyInputs, dummyOptions, None) + + def test_net_test_inputs(self): + dummyOptionsWithFile = dict(dummyOptions) + dummyOptionsWithFile['file'] = 'dummyInputFile.txt' + + net_test = NetTest(StringIO(net_test_string_with_file), + dummyOptionsWithFile, None) + + for test_class, test_method in net_test.test_cases: + self.assertEqual(len(list(test_class.inputs)), 10) + + def test_setup_local_options_in_test_cases(self): + net_test = NetTest(StringIO(net_test_string), + dummyOptions, None) + + for test_class, test_method in net_test.test_cases: + self.assertEqual(test_class.localOptions, dummyOptions) + + def test_generate_measurements_size(self): + dummyOptionsWithFile = dict(dummyOptions) + dummyOptionsWithFile['file'] = 'dummyInputFile.txt' + + net_test = NetTest(StringIO(net_test_string_with_file), + dummyOptionsWithFile, None) + + measurements = list(net_test.generateMeasurements()) + self.assertEqual(len(measuremenets), 20) + + + def dd_test_require_root_succeed(self): + n = NetTest(StringIO(net_test_root_required), + dummyOptions, None) + for test_class, method in n.test_cases: + self.assertTrue(test_class.requiresRoot) def test_require_root_failed(self): #XXX: make root fail - NetTest(StringIO(net_test_root_required), - dummyInputs, dummyOptions, None) + try: + NetTest(StringIO(net_test_root_required), + dummyOptions, None) + except NotRootError: + pass #def test_create_report_succeed(self): # pass

1 0

[ooni-probe/master] Basic unittest for representing scapy packets
by isis＠torproject.org 10 Mar '13

10 Mar '13

commit 6b78de5aeaab6e9cf226fa6a05378427dc19239f Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Nov 27 02:12:38 2012 +0100 Basic unittest for representing scapy packets (cherry picked from commit 442a4a3aa716bfcc3f8f2cd2e249dc000f991950) --- tests/test_safe_represent.py | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/tests/test_safe_represent.py b/tests/test_safe_represent.py new file mode 100644 index 0000000..82a5196 --- /dev/null +++ b/tests/test_safe_represent.py @@ -0,0 +1,14 @@ +import yaml + +from twisted.trial import unittest + +from ooni.reporter import OSafeDumper + +from scapy.all import IP, UDP + +class TestScapyRepresent(unittest.TestCase): + def test_represent_scapy(self): + data = IP()/UDP() + yaml.dump_all([data], Dumper=OSafeDumper) + +

1 0

[ooni-probe/master] Add tests for NetTest
by isis＠torproject.org 10 Mar '13

10 Mar '13

commit 7cdfc6f6dd0dbee7ac18384d5f37b1a365763ad8 Author: aagbsn <aagbsn(a)extc.org> Date: Sat Jan 12 20:35:46 2013 +0000 Add tests for NetTest Test loading NetTestCase with required options and verify that the appropriate exceptions are raised. --- tests/test_nettest.py | 58 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 57 insertions(+), 1 deletions(-) diff --git a/tests/test_nettest.py b/tests/test_nettest.py index 8546031..6ef214c 100644 --- a/tests/test_nettest.py +++ b/tests/test_nettest.py @@ -5,7 +5,8 @@ from tempfile import TemporaryFile, mkstemp from twisted.trial import unittest from twisted.internet import defer, reactor -from ooni.nettest import NetTest +from ooni.nettest import NetTest, InvalidOption, MissingRequiredOption +from ooni.nettest import FailureToLoadNetTest from ooni.tasks import BaseTask net_test_string = """ @@ -25,8 +26,17 @@ class DummyTestCase(NetTestCase): self.report['foo'] = 'foo' """ +net_test_root_required = net_test_string+""" + requiresRoot = True +""" + +#XXX you should actually implement this +net_test_with_required_option = net_test_string + dummyInputs = range(1) dummyOptions = {'spam': 'notham'} +dummyInvalidOptions = {'':''} # XXX: make invalid options +dummyOptionsWithRequiredOptions = {'':''} #XXX: set required options here #dummyNetTest = NetTest(net_test_file, inputs, options) @@ -113,3 +123,49 @@ class TestNetTest(unittest.TestCase): self.assertEqual(set(['test_a', 'test_b']), test_methods) + def test_load_with_option(self): + self.assertIsInstance(NetTest(StringIO(net_test_string), + dummyInputs, dummyOptions, None), NetTest) + + #def test_load_with_invalid_option(self): + # #XXX: raises TypeError?? + # self.assertRaises(InvalidOption, NetTest(StringIO(net_test_string), dummyInputs, + # dummyInvalidOptions, None)) + + def test_load_with_required_option(self): + self.assertIsInstance(NetTest(StringIO(net_test_with_required_option), + dummyInputs, dummyOptionsWithRequiredOptions, None), NetTest) + + #def test_load_with_missing_required_option(self): + # #XXX: raises TypeError + # self.assertRaises(MissingRequiredOption, + # NetTest(StringIO(net_test_with_required_option), dummyInputs, + # dummyOptions, None)) + + def test_require_root_succeed(self): + #XXX: make root succeed + NetTest(StringIO(net_test_root_required), + dummyInputs, dummyOptions, None) + + def test_require_root_failed(self): + #XXX: make root fail + NetTest(StringIO(net_test_root_required), + dummyInputs, dummyOptions, None) + + #def test_create_report_succeed(self): + # pass + + #def test_create_report_failed(self): + # pass + + #def test_run_all_test(self): + # raise NotImplementedError + + #def test_resume_test(self): + # pass + + #def test_progress(self): + # pass + + #def test_time_out(self): + # raise NotImplementedError

1 0

[ooni-probe/master] Add NetTestCase option validation
by isis＠torproject.org 10 Mar '13

10 Mar '13

commit 54d2aa3fb57f733ab9285df2eab685fa2e0e12fe Author: aagbsn <aagbsn(a)extc.org> Date: Sun Jan 13 12:18:47 2013 +0000 Add NetTestCase option validation Options that are passed to the NetTest constructor must be valid options defined in the NetTestCase UsageOptions with optParameters. Also handle the case where inputFile is *not* a required option and not supplied gracefully. --- ooni/nettest.py | 38 ++++++++++++++++++++++++-------------- 1 files changed, 24 insertions(+), 14 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index c9e2ed3..0fb5038 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -142,6 +142,7 @@ class NetTest(object): if test_instance.requiresRoot: checkForRoot() test_instance._checkRequiredOptions() + test_instance._checkValidOptions() klass.inputs = test_instance.getInputProcessor() @@ -269,31 +270,40 @@ class NetTestCase(object): def getInputProcessor(self): """ - This method must be called afterr + This method must be called after all options are validated by + _checkValidOptions and _checkRequiredOptions, which ensure that + if the inputFile is a required option it will be present. """ if self.inputFile: - self.inputFilename = self.localOptions[self.inputFile[0]] + if self.inputFile[0] in self.localOptions: + self.inputFilename = self.localOptions[self.inputFile[0]] - inputProcessor = self.inputProcessor - inputFilename = self.inputFilename + inputProcessor = self.inputProcessor + inputFilename = self.inputFilename - class inputProcessorIterator(object): - """ - Here we convert the input processor generator into an iterator - so that we can run it twice. - """ - def __iter__(self): - return inputProcessor(inputFilename) + class inputProcessorIterator(object): + """ + Here we convert the input processor generator into an iterator + so that we can run it twice. + """ + def __iter__(self): + return inputProcessor(inputFilename) - return inputProcessorIterator() + return inputProcessorIterator() return iter(()) + def _checkValidOptions(self): + for option in self.localOptions: + if option not in self.usageOptions(): + if not self.inputFile or option not in self.inputFile: + raise InvalidOption + def _checkRequiredOptions(self): for required_option in self.requiredOptions: log.debug("Checking if %s is present" % required_option) - if not self.localOptions[required_option]: - raise usage.UsageError("%s not specified!" % required_option) + if required_option not in self.localOptions: + raise MissingRequiredOption def __repr__(self): return "<%s inputs=%s>" % (self.__class__, self.inputs)

1 0

[ooni-probe/master] Move setUpNetTestCases into start() and set up measurementManager
by isis＠torproject.org 10 Mar '13

10 Mar '13

commit 786436d45d9dfc4c62a46dbf6e2bf0ab9ca94f61 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Jan 13 12:58:26 2013 +0000 Move setUpNetTestCases into start() and set up measurementManager Also updates the test cases. --- ooni/nettest.py | 8 ++++---- tests/test_nettest.py | 20 ++++++++++++++------ 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index 0fb5038..01dde72 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -13,7 +13,7 @@ class NoTestCasesFound(Exception): pass class NetTest(object): - director = None + measurementManager = None method_prefix = 'test' def __init__(self, net_test_file, options, report): @@ -26,15 +26,15 @@ class NetTest(object): """ self.options = options self.report = report - self.test_cases = self.loadNetTest(net_test_file) - self.setUpNetTestCases() def start(self): """ + Set up tests and start running. Start tests and generate measurements. """ - raise NotImplementedError + self.setUpNetTestCases() + self.measurementManager.schedule(self.generateMeasurements()) def loadNetTest(self, net_test_file): """ diff --git a/tests/test_nettest.py b/tests/test_nettest.py index 07e991e..a23d16b 100644 --- a/tests/test_nettest.py +++ b/tests/test_nettest.py @@ -190,24 +190,29 @@ class TestNetTest(unittest.TestCase): net_test = NetTest(StringIO(net_test_string), dummyOptions, None) self.assertIsInstance(net_test, NetTest) + net_test.setUpNetTestCases() for test_klass, test_meth in net_test.test_cases: for option in dummyOptions.keys(): self.assertIn(option, test_klass.usageOptions()) def test_load_with_invalid_option(self): try: - NetTest(StringIO(net_test_string), dummyInvalidOptions, None) + net_test = NetTest(StringIO(net_test_string), dummyInvalidOptions, None) + net_test.setUpNetTestCases() except InvalidOption: pass def test_load_with_required_option(self): - self.assertIsInstance(NetTest(StringIO(net_test_with_required_option), - dummyOptionsWithRequiredOptions, None), NetTest) + net_test = NetTest(StringIO(net_test_with_required_option), + dummyOptionsWithRequiredOptions, None) + net_test.setUpNetTestCases() + self.assertIsInstance(net_test, NetTest) def test_load_with_missing_required_option(self): try: - NetTest(StringIO(net_test_with_required_option), + net_test = NetTest(StringIO(net_test_with_required_option), dummyOptions, None) + net_test.setUpNetTestCases() except MissingRequiredOption: pass @@ -217,6 +222,7 @@ class TestNetTest(unittest.TestCase): net_test = NetTest(StringIO(net_test_string_with_file), dummyOptionsWithFile, None) + net_test.setUpNetTestCases() for test_class, test_method in net_test.test_cases: self.assertEqual(len(list(test_class.inputs)), 10) @@ -224,6 +230,7 @@ class TestNetTest(unittest.TestCase): def test_setup_local_options_in_test_cases(self): net_test = NetTest(StringIO(net_test_string), dummyOptions, None) + net_test.setUpNetTestCases() for test_class, test_method in net_test.test_cases: self.assertEqual(test_class.localOptions, dummyOptions) @@ -234,7 +241,7 @@ class TestNetTest(unittest.TestCase): net_test = NetTest(StringIO(net_test_string_with_file), dummyOptionsWithFile, None) - + net_test.setUpNetTestCases() measurements = list(net_test.generateMeasurements()) self.assertEqual(len(measurements), 20) @@ -248,8 +255,9 @@ class TestNetTest(unittest.TestCase): def test_require_root_failed(self): #XXX: will fail if you run as root try: - NetTest(StringIO(net_test_root_required), + net_test = NetTest(StringIO(net_test_root_required), dummyOptions, None) + net_test.setUpNetTestCases() except NotRootError: pass

1 0

[ooni-probe/master] Add tests for missing required options and invalid options
by isis＠torproject.org 10 Mar '13

10 Mar '13

commit bbb766fdad91cc5f7e167063f44b1137dd7f4939 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Jan 13 12:23:02 2013 +0000 Add tests for missing required options and invalid options --- tests/test_nettest.py | 73 +++++++++++++++++++++++++++++++----------------- 1 files changed, 47 insertions(+), 26 deletions(-) diff --git a/tests/test_nettest.py b/tests/test_nettest.py index f2d4c6f..07e991e 100644 --- a/tests/test_nettest.py +++ b/tests/test_nettest.py @@ -51,15 +51,34 @@ class DummyTestCase(NetTestCase): self.report['foo'] = 'foo' """ -#XXX you should actually implement this -net_test_with_required_option = net_test_string +net_test_with_required_option = """ +from twisted.python import usage +from ooni.nettest import NetTestCase + +class UsageOptions(usage.Options): + optParameters = [['spam', 's', None, 'ham'], + ['foo', 'o', None, 'moo'], + ['bar', 'o', None, 'baz'], + ] + +class DummyTestCase(NetTestCase): + inputFile = ['file', 'f', None, 'The input File'] + + usageOptions = UsageOptions + + def test_a(self): + self.report['bar'] = 'bar' + + def test_b(self): + self.report['foo'] = 'foo' + + requiredOptions = ['foo', 'bar'] +""" dummyInputs = range(1) dummyOptions = {'spam': 'notham'} -dummyInvalidOptions = {'':''} # XXX: make invalid options -dummyOptionsWithRequiredOptions = {'':''} #XXX: set required options here - -#dummyNetTest = NetTest(net_test_file, inputs, options) +dummyInvalidOptions = {'cram': 'jam'} +dummyOptionsWithRequiredOptions = {'foo':'moo', 'bar':'baz'} class DummyMeasurement(BaseTask): def run(self): @@ -167,29 +186,30 @@ class TestNetTest(unittest.TestCase): self.assertEqual(set(['test_a', 'test_b']), test_methods) - def dd_test_load_with_option(self): + def test_load_with_option(self): net_test = NetTest(StringIO(net_test_string), dummyOptions, None) - - self.assertIsNotNone(net_test.usageOptions) - self.assertIsNotNone(net_test.usageOptions.optParameters) self.assertIsInstance(net_test, NetTest) + for test_klass, test_meth in net_test.test_cases: + for option in dummyOptions.keys(): + self.assertIn(option, test_klass.usageOptions()) - #def test_load_with_invalid_option(self): - # #XXX: raises TypeError?? - # self.assertRaises(InvalidOption, NetTest(StringIO(net_test_string), dummyInputs, - # dummyInvalidOptions, None)) + def test_load_with_invalid_option(self): + try: + NetTest(StringIO(net_test_string), dummyInvalidOptions, None) + except InvalidOption: + pass def test_load_with_required_option(self): self.assertIsInstance(NetTest(StringIO(net_test_with_required_option), dummyOptionsWithRequiredOptions, None), NetTest) - #def test_load_with_missing_required_option(self): - # #XXX: raises TypeError - # self.assertRaises(MissingRequiredOption, - # NetTest(StringIO(net_test_with_required_option), dummyInputs, - # dummyOptions, None)) - + def test_load_with_missing_required_option(self): + try: + NetTest(StringIO(net_test_with_required_option), + dummyOptions, None) + except MissingRequiredOption: + pass def test_net_test_inputs(self): dummyOptionsWithFile = dict(dummyOptions) @@ -218,14 +238,15 @@ class TestNetTest(unittest.TestCase): measurements = list(net_test.generateMeasurements()) self.assertEqual(len(measurements), 20) - def dd_test_require_root_succeed(self): - n = NetTest(StringIO(net_test_root_required), - dummyOptions, None) - for test_class, method in n.test_cases: - self.assertTrue(test_class.requiresRoot) + #def test_require_root_succeed(self): + # #XXX: will require root to run + # n = NetTest(StringIO(net_test_root_required), + # dummyOptions, None) + # for test_class, method in n.test_cases: + # self.assertTrue(test_class.requiresRoot) def test_require_root_failed(self): - #XXX: make root fail + #XXX: will fail if you run as root try: NetTest(StringIO(net_test_root_required), dummyOptions, None)

1 0

[ooni-probe/master] Start outlining unittests for director
by isis＠torproject.org 10 Mar '13

10 Mar '13

commit a90f2d1e06f707c8cc86efb8d17dbff59b86e90b Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Jan 13 20:23:34 2013 +0100 Start outlining unittests for director --- ooni/director.py | 8 ++--- tests/test_director.py | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 5 deletions(-) diff --git a/ooni/director.py b/ooni/director.py index 1ef5aab..582bb84 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -143,10 +143,8 @@ class Director(object): report.reportEntryManager = self.reportEntryManager net_test = NetTest(net_test_file, options, report) - net_test.measurmentManager = self.measurementManager + net_test.measurementManager = self.measurementManager - try: - net_test.start() - except Exception, e: - pass + d = net_test.start() + return d diff --git a/tests/test_director.py b/tests/test_director.py new file mode 100644 index 0000000..fa13d9e --- /dev/null +++ b/tests/test_director.py @@ -0,0 +1,66 @@ +from twisted.internet import defer, base +from twisted.trial import unittest + +from ooni.director import Director +base.DelayedCall.debug = True +class MockMeasurement(object): + def run(self): + return defer.succeed(42) + +net_test_string = """ +from twisted.python import usage +from ooni.nettest import NetTestCase + +class UsageOptions(usage.Options): + optParameters = [['spam', 's', None, 'ham']] + +class DummyTestCase(NetTestCase): + inputFile = ['file', 'f', None, 'The input File'] + + usageOptions = UsageOptions + + def test_a(self): + self.report['bar'] = 'bar' + + def test_b(self): + self.report['foo'] = 'foo' +""" + + +dummyOptions = {'spam': 1, 'file': 'dummyInputFile.txt'} + +class MockReporter(object): + def __init__(self): + self.created = defer.succeed(None) + + def createReport(self): + pass + + def write(self): + pass + +class TestDirector(unittest.TestCase): + def setUp(self): + with open('dummyInputFile.txt', 'w') as f: + for i in range(10): + f.write("%s\n" % i) + + reporters = [MockReporter] + self.director = Director(reporters) + + def tearDown(self): + pass + + def test_start_net_test(self): + d = self.director.startTest(net_test_string, dummyOptions) + + @d.addCallback + def done(result): + print "SOMETHING" + self.assertEqual(self.director.successfulMeasurements, 20) + + return d + + def test_stop_net_test(self): + pass +

1 0