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

[ooni-probe/develop] Remove now superfluos runner unittest
by isis＠torproject.org 26 Jun '13

26 Jun '13

commit 54d7a959cfd218beae394f940408f430701cb5e3 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 27 17:11:31 2013 +0100 Remove now superfluos runner unittest --- tests/test_runner.py | 80 -------------------------------------------------- 1 file changed, 80 deletions(-) diff --git a/tests/test_runner.py b/tests/test_runner.py deleted file mode 100644 index 0b148e1..0000000 --- a/tests/test_runner.py +++ /dev/null @@ -1,80 +0,0 @@ -from twisted.trial import unittest - - -from ooni.inputunit import InputUnit -from ooni.nettest import NetTestCase -from ooni.reporter import OReporter - -from ooni.runner import loadTestsAndOptions, runTestCasesWithInputUnit - -class DummyTestCase(NetTestCase): - def test_a(self): - self.report['bar'] = 'bar' - def test_b(self): - self.report['foo'] = 'foo' - -class DummyTestCasePP(DummyTestCase): - def postProcessor(self, report): - self.report['antani'] = 'sblinda' - -class DummyReporter(OReporter): - dummy_report = [] - def createReport(self, options): - pass - - def writeReportEntry(self, entry): - self.dummy_report.append(entry) - -class TestRunner(unittest.TestCase): - def test_load_test_and_options(self): - input_unit = InputUnit([0,1,2,3,4]) - cmd_line_options = {} - test_cases, options = loadTestsAndOptions([DummyTestCase], - cmd_line_options) - self.assertEqual(test_cases[0][1], 'test_b') - self.assertEqual(test_cases[1][1], 'test_a') - - def test_run_testcase_with_input_unit(self): - def done(result): - report = oreporter.dummy_report - self.assertEqual(len(report), 10*2) - # XXX debug why this is failing - # for idx, entry in enumerate(oreporter.dummy_report): - # if idx % 2 == 0: - # self.assertEqual(entry['report']['foo'], 'foo') - # else: - # self.assertEqual(entry['report']['bar'], 'bar') - - input_unit = InputUnit([0,1,2,3,4]) - cmd_line_options = {'collector': None} - - oreporter = DummyReporter(cmd_line_options) - oreporter.dummy_report = [] - - test_cases, options = loadTestsAndOptions([DummyTestCase], - cmd_line_options) - - d = runTestCasesWithInputUnit(test_cases, input_unit, oreporter, oreporter) - d.addBoth(done) - return d - - def test_with_post_processing(self): - def done(result): - report = oreporter.dummy_report - self.assertEqual(len(report), 6) - for entry in report: - if entry['test_name'] == 'summary': - self.assertEqual(entry['report'], {'antani': 'sblinda'}) - - input_unit = InputUnit([None]) - cmd_line_options = {'collector': None} - - oreporter = DummyReporter(cmd_line_options) - oreporter.dummy_report = [] - - test_cases, options = loadTestsAndOptions([DummyTestCasePP], - cmd_line_options) - - d = runTestCasesWithInputUnit(test_cases, input_unit, oreporter, oreporter) - d.addBoth(done) - return d

1 0

[ooni-probe/develop] Change how we pass arguments to the nettest loader
by isis＠torproject.org 26 Jun '13

26 Jun '13

commit 64715a714170b9175d07ea9420ef8b3dcf177c83 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 27 18:11:30 2013 +0100 Change how we pass arguments to the nettest loader * Explicit the passing of the nettest file argument --- ooni/errors.py | 4 ++++ ooni/nettest.py | 12 ++++++------ ooni/oonicli.py | 6 ++++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ooni/errors.py b/ooni/errors.py index 2023dbf..a194b96 100644 --- a/ooni/errors.py +++ b/ooni/errors.py @@ -126,3 +126,7 @@ class InvalidOONIBCollectorAddress(Exception): class AllReportersFailed(Exception): pass +class GeoIPDataFilesNotFound(Exception): + pass + + diff --git a/ooni/nettest.py b/ooni/nettest.py index 6323989..0b3e69c 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -10,7 +10,7 @@ from ooni.utils import log, checkForRoot, NotRootError, geodata from ooni import config from ooni import otime -from ooni.errors import AllReportersFailed +from ooni import errors as e from inspect import getmembers from StringIO import StringIO @@ -21,12 +21,12 @@ class NoTestCasesFound(Exception): class NetTestLoader(object): method_prefix = 'test' - def __init__(self, options): + def __init__(self, options, test_file=None, test_string=None): self.options = options - if 'test_file' in options: - self.loadNetTestFile(options['test_file']) - elif 'test_string' in options: - self.loadNetTestString(options['test_string']) + if test_file: + self.loadNetTestFile(test_file) + elif test_string: + self.loadNetTestString(test_string) @property def testDetails(self): diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 243b90c..73d7709 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -107,10 +107,12 @@ def runWithDirector(): if global_options['testdeck']: test_deck = yaml.safe_load(open(global_options['testdeck'])) for test in test_deck: - test_list.append(NetTestLoader(test['options'])) + test_list.append(NetTestLoader(test['options'], + test_file=global_options['test_file'])) else: log.debug("No test deck detected") - test_list.append(NetTestLoader(global_options)) + test_list.append(NetTestLoader(global_options['subargs'], + test_file=global_options['test_file'])) # check each test's usageOptions for net_test_loader in test_list:

1 0

[ooni-probe/develop] Rename private option to test_file to separate it from test string.
by isis＠torproject.org 26 Jun '13

26 Jun '13

commit d1f41883c8d0187e6360b2a2b9075f0cb7eb7a37 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 27 17:08:43 2013 +0100 Rename private option to test_file to separate it from test string. --- ooni/oonicli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 2fd4688..243b90c 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -68,7 +68,7 @@ class Options(usage.Options): if self['testdeck']: return try: - self['test'] = args[0] + self['test_file'] = args[0] self['subargs'] = args[1:] except: raise usage.UsageError("No test filename specified!")

1 0

[ooni-probe/develop] Fix unittests for nettest
by isis＠torproject.org 26 Jun '13

26 Jun '13

commit 04d5fc5d157b7e5ac47230ee018fb382756f85dc Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 27 17:05:27 2013 +0100 Fix unittests for nettest --- tests/test_nettest.py | 62 +++++++++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 25 deletions(-) diff --git a/tests/test_nettest.py b/tests/test_nettest.py index 5645dbf..78240d5 100644 --- a/tests/test_nettest.py +++ b/tests/test_nettest.py @@ -61,7 +61,7 @@ class DummyTestCase(NetTestCase): self.report['foo'] = 'foo' """ -net_test_with_required_option = """ +net_test_string_with_required_option = """ from twisted.python import usage from ooni.nettest import NetTestCase @@ -124,8 +124,9 @@ class TestNetTest(unittest.TestCase): f.write(net_test_string) f.close() - ntl = NetTestLoader(net_test_file, - dummyArgs) + ntl = NetTestLoader(dummyArgs) + ntl.loadNetTestFile(net_test_file) + self.verifyMethods(ntl.testCases) os.unlink(net_test_file) @@ -134,8 +135,9 @@ class TestNetTest(unittest.TestCase): Given a file like object verify that the net test cases are properly generated. """ - ntl = NetTestLoader(net_test_string, - dummyArgs) + ntl = NetTestLoader(dummyArgs) + ntl.loadNetTestString(net_test_string) + self.verifyMethods(ntl.testCases) def test_load_net_test_from_StringIO(self): @@ -143,13 +145,15 @@ class TestNetTest(unittest.TestCase): Given a file like object verify that the net test cases are properly generated. """ - ntl = NetTestLoader(StringIO(net_test_string), - dummyArgs) + ntl = NetTestLoader(dummyArgs) + ntl.loadNetTestString(net_test_string) + self.verifyMethods(ntl.testCases) def test_load_with_option(self): - ntl = NetTestLoader(StringIO(net_test_string), - dummyArgs) + ntl = NetTestLoader(dummyArgs) + ntl.loadNetTestString(net_test_string) + self.assertIsInstance(ntl, NetTestLoader) for test_klass, test_meth in ntl.testCases: for option in dummyOptions.keys(): @@ -157,27 +161,32 @@ class TestNetTest(unittest.TestCase): def test_load_with_invalid_option(self): try: - ntl = NetTestLoader(StringIO(net_test_string), dummyInvalidArgs) + ntl = NetTestLoader(dummyInvalidArgs) + ntl.loadNetTestString(net_test_string) + ntl.checkOptions() raise Exception except UsageError: pass def test_load_with_required_option(self): - net_test = NetTestLoader(StringIO(net_test_with_required_option), - dummyArgsWithRequiredOptions) - self.assertIsInstance(net_test, NetTestLoader) + ntl = NetTestLoader(dummyArgsWithRequiredOptions) + ntl.loadNetTestString(net_test_string_with_required_option) + + self.assertIsInstance(ntl, NetTestLoader) def test_load_with_missing_required_option(self): try: - net_test = NetTestLoader(StringIO(net_test_with_required_option), - dummyArgs) + ntl = NetTestLoader(dummyArgs) + ntl.loadNetTestString(net_test_string_with_required_option) + except MissingRequiredOption: pass def test_net_test_inputs(self): - ntl = NetTestLoader(StringIO(net_test_string_with_file), - dummyArgsWithFile) + ntl = NetTestLoader(dummyArgsWithFile) + ntl.loadNetTestString(net_test_string_with_file) + ntl.checkOptions() # XXX: if you use the same test_class twice you will have consumed all @@ -189,17 +198,18 @@ class TestNetTest(unittest.TestCase): self.assertEqual(len(list(test_class.inputs)), 10) def test_setup_local_options_in_test_cases(self): - ntl = NetTestLoader(StringIO(net_test_string), - dummyArgs) + ntl = NetTestLoader(dummyArgs) + ntl.loadNetTestString(net_test_string) + ntl.checkOptions() for test_class, test_method in ntl.testCases: self.assertEqual(test_class.localOptions, dummyOptions) def test_generate_measurements_size(self): + ntl = NetTestLoader(dummyArgsWithFile) + ntl.loadNetTestString(net_test_string_with_file) - ntl = NetTestLoader(StringIO(net_test_string_with_file), - dummyArgsWithFile) ntl.checkOptions() net_test = NetTest(ntl, None) @@ -207,8 +217,9 @@ class TestNetTest(unittest.TestCase): self.assertEqual(len(measurements), 20) def test_net_test_completed_callback(self): - ntl = NetTestLoader(StringIO(net_test_string_with_file), - dummyArgsWithFile) + ntl = NetTestLoader(dummyArgsWithFile) + ntl.loadNetTestString(net_test_string_with_file) + ntl.checkOptions() director = Director() @@ -224,8 +235,9 @@ class TestNetTest(unittest.TestCase): def test_require_root_succeed(self): #XXX: will require root to run - ntl = NetTestLoader(StringIO(net_test_root_required), - dummyArgs) + ntl = NetTestLoader(dummyArgs) + ntl.loadNetTestString(net_test_root_required) + for test_class, method in ntl.testCases: self.assertTrue(test_class.requiresRoot)

1 0

[ooni-probe/develop] Merge branch 'master' into task_manager
by isis＠torproject.org 26 Jun '13

26 Jun '13

commit d3ab36b744b6e8e9862fd14ffae586d1b1a8e32f Merge: 1710ca5 6f16d8c Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 27 16:36:44 2013 +0100 Merge branch 'master' into task_manager * master: Order matters for little ol pip requirements.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)

1 0

[ooni-probe/develop] Refactoring of NetTestLoader
by isis＠torproject.org 26 Jun '13

26 Jun '13

commit 8bead060681d86cdfa43f35b1b57567e51816aa6 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 27 17:05:39 2013 +0100 Refactoring of NetTestLoader * Make it clear that calling one of those methods can be extremely dangerous * Kill a bug spotted thanks to unittesting --- ooni/nettest.py | 86 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 40 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index 6273d34..6323989 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -23,7 +23,10 @@ class NetTestLoader(object): def __init__(self, options): self.options = options - self.testCases = self.loadNetTest(options['test']) + if 'test_file' in options: + self.loadNetTestFile(options['test_file']) + elif 'test_string' in options: + self.loadNetTestString(options['test_string']) @property def testDetails(self): @@ -109,7 +112,45 @@ class NetTestLoader(object): assert usage_options == test_class.usageOptions return usage_options - def loadNetTest(self, net_test_file): + def loadNetTestString(self, net_test_string): + """ + Load NetTest from a string. + WARNING input to this function *MUST* be sanitized and *NEVER* be + untrusted. + Failure to do so will result in code exec. + + net_test_string: + + a string that contains the net test to be run. + """ + net_test_file_object = StringIO(net_test_string) + + ns = {} + test_cases = [] + exec net_test_file_object.read() in ns + for item in ns.itervalues(): + test_cases.extend(self._get_test_methods(item)) + + if not test_cases: + raise NoTestCasesFound + + self.setupTestCases(test_cases) + + def loadNetTestFile(self, net_test_file): + """ + Load NetTest from a file. + """ + test_cases = [] + module = filenameToModule(net_test_file) + for __, item in getmembers(module): + test_cases.extend(self._get_test_methods(item)) + + if not test_cases: + raise NoTestCasesFound + + self.setupTestCases(test_cases) + + def setupTestCases(self, test_cases): """ Creates all the necessary test_cases (a list of tuples containing the NetTestCase (test_class, test_method)) @@ -130,25 +171,10 @@ class NetTestLoader(object): 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_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 hasattr(net_test_file, 'read'): - test_cases = self._loadNetTestFromFileObject(net_test_file) - - if not test_cases: - raise NoTestCasesFound - test_class, _ = test_cases[0] self.testVersion = test_class.version self.testName = test_class.name.lower().replace(' ','_') - return test_cases + self.testCases = test_cases def checkOptions(self): """ @@ -160,7 +186,8 @@ class NetTestLoader(object): for klass in test_classes: options = self.usageOptions() - options.parseOptions(self.options['subargs']) + options.parseOptions(self.options) + if options: klass.localOptions = options @@ -175,27 +202,6 @@ class NetTestLoader(object): inputs = [None] klass.inputs = inputs - def _loadNetTestFromFileObject(self, net_test_string): - """ - Load NetTest from a string - """ - ns = {} - test_cases = [] - exec net_test_string.read() in ns - for item in ns.itervalues(): - test_cases.extend(self._get_test_methods(item)) - return test_cases - - def _loadNetTestFile(self, net_test_file): - """ - Load NetTest from a file - """ - test_cases = [] - module = filenameToModule(net_test_file) - for __, item in getmembers(module): - test_cases.extend(self._get_test_methods(item)) - return test_cases - def _get_test_methods(self, item): """ Look for test_ methods in subclasses of NetTestCase

1 0

[ooni-probe/develop] Fix director unittest
by isis＠torproject.org 26 Jun '13

26 Jun '13

commit 1ac4e4fd8f13b8e358034d3b69174fdc19b02543 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 27 17:11:22 2013 +0100 Fix director unittest --- tests/test_director.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/test_director.py b/tests/test_director.py index 484cb21..a9dfbe8 100644 --- a/tests/test_director.py +++ b/tests/test_director.py @@ -42,9 +42,11 @@ class TestDirector(unittest.TestCase): pass def test_start_net_test(self): - net_test_loader = NetTestLoader(net_test_string, dummyArgs) - net_test_loader.checkOptions() - d = self.director.startNetTest('', net_test_loader, self.reporters) + ntl = NetTestLoader(dummyArgs) + ntl.loadNetTestString(net_test_string) + + ntl.checkOptions() + d = self.director.startNetTest('', ntl, self.reporters) @d.addCallback def done(result):

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 25 Jun '13

25 Jun '13

commit dfdaa27e32eb05f26939844ecf8d478686ce8bb6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 25 23:46:10 2013 +0000 Update translations for liveusb-creator_completed --- pt_BR/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 39262c3..e663652 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-02-14 16:07+0100\n" -"PO-Revision-Date: 2013-06-25 23:15+0000\n" +"PO-Revision-Date: 2013-06-25 23:20+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 25 Jun '13

25 Jun '13

commit ba5564023b152cd0d1c4847db52a05b584527264 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 25 23:46:06 2013 +0000 Update translations for liveusb-creator --- pt_BR/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 39262c3..e663652 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-02-14 16:07+0100\n" -"PO-Revision-Date: 2013-06-25 23:15+0000\n" +"PO-Revision-Date: 2013-06-25 23:20+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n"

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 25 Jun '13

25 Jun '13

commit 8e2ef7ffb569ed7ef2de22053d691f9ec4ad8fd7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 25 23:16:18 2013 +0000 Update translations for liveusb-creator_completed --- pt_BR/pt_BR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index ee3b5d6..39262c3 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-02-14 16:07+0100\n" -"PO-Revision-Date: 2013-06-25 20:10+0000\n" +"PO-Revision-Date: 2013-06-25 23:15+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -391,7 +391,7 @@ msgstr "Não foi possível localizar nenhum dispositivo USB" #: ../liveusb/creator.py:1198 msgid "Unable to find any removable device" -msgstr "Não foi possível localizar nenhum dispositivo de disco removível" +msgstr "Não foi possível localizar nenhum periférico removível" #: ../liveusb/creator.py:1038 msgid "Unable to find partition" @@ -477,7 +477,7 @@ msgstr "Sistema de arquivos não suportado: %s\nCaso esteja tentando atualizar u msgid "" "Unsupported filesystem: %s\n" "Please backup and format your USB key with the FAT filesystem." -msgstr "Sistema de arquivos não suportado: %s\nPor favor, faça um backup e formate o seu drive USB com o sistema de arquivos FAT." +msgstr "Sistema de arquivos incompatível: %s\nPor favor, faça um backup e formate o seu drive USB com o sistema de arquivos FAT." #: ../liveusb/launcher_ui.py:154 msgid "Upgrade from ISO"

1 0