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

[stem/master] Didn't account for test modules citing the class
by atagar＠torproject.org 03 Mar '15

03 Mar '15

commit 3263d5bd94e79f68c91c4ff27244878c5483d032 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 3 09:23:13 2015 -0800 Didn't account for test modules citing the class Oops! Didn't catch that the test modules include the class. For example... test.unit.util.conf.TestConf.test_parse_enum_csv civ's original patch did, though he surfaced it in our output which caused our test names to be a lot longer. Changing us back so we hide it. --- run_tests.py | 18 ++++++++++++------ test/util.py | 8 +++++--- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/run_tests.py b/run_tests.py index 3af6d31..8e2b8f2 100755 --- a/run_tests.py +++ b/run_tests.py @@ -445,12 +445,18 @@ def _run_test(args, test_class, output_filters, logging_buffer): if args.verbose: test.output.print_divider(test_class) else: - label = test_class - - if label.startswith('test.unit.'): - label = label[10:] - elif label.startswith('test.integ.'): - label = label[11:] + # Test classes look like... + # + # test.unit.util.conf.TestConf.test_parse_enum_csv + # + # We want to strip the 'test.unit.' or 'test.integ.' prefix since it's + # redundant. We also want to drop the test class name. The individual test + # name at the end it optional (only present if we used the '--test' + # argument). + + label_comp = test_class.split('.')[2:] + del label_comp[-1 if label_comp[-1][0].isupper() else -2] + label = '.'.join(label_comp) label = ' %s...' % label label = '%-54s' % label diff --git a/test/util.py b/test/util.py index 35909e5..eb8b5eb 100644 --- a/test/util.py +++ b/test/util.py @@ -110,16 +110,18 @@ def get_integ_tests(module_prefix = None): def _get_tests(modules, module_prefix): for import_name in modules: if import_name: - if not module_prefix or import_name.startswith(module_prefix): + module, module_name = import_name.rsplit('.', 1) # example: util.conf.TestConf + + if not module_prefix or module.startswith(module_prefix): yield import_name - elif module_prefix.startswith(import_name): + elif module_prefix.startswith(module): # might be a single test in this module, check if we match any module, test = module_prefix.rsplit('.', 1) # TODO: should check if the test exists - yield module_prefix + yield '%s.%s' % (import_name, test) def get_help_message():

1 0

[stem/master] No need for a 'if suite' check
by atagar＠torproject.org 03 Mar '15

03 Mar '15

commit 847d8a80deb20f6973b0e466cc52ffad90c5d831 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 3 08:56:33 2015 -0800 No need for a 'if suite' check We can just return prematurely. No need to hide everything else behind a conditional. --- run_tests.py | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/run_tests.py b/run_tests.py index 876162d..3af6d31 100755 --- a/run_tests.py +++ b/run_tests.py @@ -457,29 +457,27 @@ def _run_test(args, test_class, output_filters, logging_buffer): println(label, STATUS, NO_NL) - suite = None try: suite = unittest.TestLoader().loadTestsFromName(test_class) except: println(' failed (%0.2fs)' % (time.time() - start_time), ERROR) + return None test_results = StringIO() - run_result = None - - if suite: - run_result = unittest.TextTestRunner(test_results, verbosity=2).run(suite) - if args.verbose: - println(test.output.apply_filters(test_results.getvalue(), *output_filters)) - elif not run_result.failures and not run_result.errors: - println(' success (%0.2fs)' % (time.time() - start_time), SUCCESS) + run_result = unittest.TextTestRunner(test_results, verbosity=2).run(suite) + + if args.verbose: + println(test.output.apply_filters(test_results.getvalue(), *output_filters)) + elif not run_result.failures and not run_result.errors: + println(' success (%0.2fs)' % (time.time() - start_time), SUCCESS) + else: + if args.quiet: + println(label, STATUS, NO_NL, STDERR) + println(' failed (%0.2fs)' % (time.time() - start_time), ERROR, STDERR) + println(test.output.apply_filters(test_results.getvalue(), *output_filters), STDERR) else: - if args.quiet: - println(label, STATUS, NO_NL, STDERR) - println(' failed (%0.2fs)' % (time.time() - start_time), ERROR, STDERR) - println(test.output.apply_filters(test_results.getvalue(), *output_filters), STDERR) - else: - println(' failed (%0.2fs)' % (time.time() - start_time), ERROR) - println(test.output.apply_filters(test_results.getvalue(), *output_filters), NO_NL) + println(' failed (%0.2fs)' % (time.time() - start_time), ERROR) + println(test.output.apply_filters(test_results.getvalue(), *output_filters), NO_NL) test.output.print_logging(logging_buffer)

1 0

[stem/master] Addings support for testing single methods
by atagar＠torproject.org 03 Mar '15

03 Mar '15

commit c9deaac9c29bcb37da4da6083d2e92bbb2819ef8 Author: Cristóbal <cristobal.leiva(a)usach.cl> Date: Mon Mar 2 14:04:09 2015 -0300 Addings support for testing single methods --- run_tests.py | 38 ++++++++++++++++++++++---------------- test/util.py | 41 ++++++++++++++++++++++++++--------------- 2 files changed, 48 insertions(+), 31 deletions(-) diff --git a/run_tests.py b/run_tests.py index bfdd101..876162d 100755 --- a/run_tests.py +++ b/run_tests.py @@ -443,9 +443,9 @@ def _run_test(args, test_class, output_filters, logging_buffer): start_time = time.time() if args.verbose: - test.output.print_divider(test_class.__module__) + test.output.print_divider(test_class) else: - label = test_class.__module__ + label = test_class if label.startswith('test.unit.'): label = label[10:] @@ -457,23 +457,29 @@ def _run_test(args, test_class, output_filters, logging_buffer): println(label, STATUS, NO_NL) - suite = unittest.TestLoader().loadTestsFromTestCase(test_class) + suite = None + try: + suite = unittest.TestLoader().loadTestsFromName(test_class) + except: + println(' failed (%0.2fs)' % (time.time() - start_time), ERROR) test_results = StringIO() - run_result = unittest.TextTestRunner(test_results, verbosity=2).run(suite) - - if args.verbose: - println(test.output.apply_filters(test_results.getvalue(), *output_filters)) - elif not run_result.failures and not run_result.errors: - println(' success (%0.2fs)' % (time.time() - start_time), SUCCESS) - else: - if args.quiet: - println(label, STATUS, NO_NL, STDERR) - println(' failed (%0.2fs)' % (time.time() - start_time), ERROR, STDERR) - println(test.output.apply_filters(test_results.getvalue(), *output_filters), STDERR) + run_result = None + + if suite: + run_result = unittest.TextTestRunner(test_results, verbosity=2).run(suite) + if args.verbose: + println(test.output.apply_filters(test_results.getvalue(), *output_filters)) + elif not run_result.failures and not run_result.errors: + println(' success (%0.2fs)' % (time.time() - start_time), SUCCESS) else: - println(' failed (%0.2fs)' % (time.time() - start_time), ERROR) - println(test.output.apply_filters(test_results.getvalue(), *output_filters), NO_NL) + if args.quiet: + println(label, STATUS, NO_NL, STDERR) + println(' failed (%0.2fs)' % (time.time() - start_time), ERROR, STDERR) + println(test.output.apply_filters(test_results.getvalue(), *output_filters), STDERR) + else: + println(' failed (%0.2fs)' % (time.time() - start_time), ERROR) + println(test.output.apply_filters(test_results.getvalue(), *output_filters), NO_NL) test.output.print_logging(logging_buffer) diff --git a/test/util.py b/test/util.py index b6bca29..9a768d5 100644 --- a/test/util.py +++ b/test/util.py @@ -83,6 +83,8 @@ def get_unit_tests(module_substring = None): :returns: an **iterator** for our unit tests """ + if module_substring and module_substring.startswith('test.unit.') == False: + module_substring = 'test.unit.' + module_substring return _get_tests(CONFIG['test.unit_tests'].splitlines(), module_substring) @@ -95,31 +97,40 @@ def get_integ_tests(module_substring = None): :returns: an **iterator** for our integration tests """ + if module_substring and module_substring.startswith('test.integ.') == False: + module_substring = 'test.integ.' + module_substring return _get_tests(CONFIG['test.integ_tests'].splitlines(), module_substring) def _get_tests(modules, module_substring): + # Look for module_substring in the list of all modules + modules_found = 0 for import_name in modules: if import_name: if module_substring and module_substring not in import_name: continue - # Dynamically imports test modules. The __import__() call has a couple - # quirks that make this a little clunky... - # - # * it only accepts modules, not the actual class we want to import - # - # * it returns the top level module, so we need to transverse into it - # for the test class - - module_name = '.'.join(import_name.split('.')[:-1]) - module = __import__(module_name) - - for subcomponent in import_name.split('.')[1:]: - module = getattr(module, subcomponent) - - yield module + modules_found += 1 + yield import_name + + # If no modules were found, then it might be that we were given + # a method (e.g test.integ.process.some_method). + # Delete the method substring and look again in the list of modules + if modules_found == 0: + module_list = module_substring.split('.') + # At this point all module_substring should be test.{integ|unit}.something + if(len(module_list) > 3): + module_substring = '.'.join(module_list[:-1]) + class_method = module_list[-1] + + for import_name in modules: + if import_name: + if module_substring and module_substring not in import_name: + continue + + # If found, return module.method + yield import_name + '.' + class_method def get_help_message():

1 0

[stem/master] State if the test doesn't exist
by atagar＠torproject.org 03 Mar '15

03 Mar '15

commit 230a8aa131dd51234fb2b8df4fae463cef5cce9b Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 3 09:28:35 2015 -0800 State if the test doesn't exist Initially I planned for _get_tests() to detect if the test exists, but on reflection it's better if we surface it in our output... util.conf.test_parse_enum_csvv... no such test This way the user will be informed of the error. --- run_tests.py | 3 ++- test/util.py | 7 ++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/run_tests.py b/run_tests.py index 8e2b8f2..497a3fc 100755 --- a/run_tests.py +++ b/run_tests.py @@ -466,7 +466,8 @@ def _run_test(args, test_class, output_filters, logging_buffer): try: suite = unittest.TestLoader().loadTestsFromName(test_class) except: - println(' failed (%0.2fs)' % (time.time() - start_time), ERROR) + # should only come up if user provided '--test' for something that doesn't exist + println(" no such test", ERROR) return None test_results = StringIO() diff --git a/test/util.py b/test/util.py index eb8b5eb..55243a3 100644 --- a/test/util.py +++ b/test/util.py @@ -115,12 +115,9 @@ def _get_tests(modules, module_prefix): if not module_prefix or module.startswith(module_prefix): yield import_name elif module_prefix.startswith(module): - # might be a single test in this module, check if we match any - - module, test = module_prefix.rsplit('.', 1) - - # TODO: should check if the test exists + # single test for this module + test = module_prefix.rsplit('.', 1)[1] yield '%s.%s' % (import_name, test)

1 0

[stem/master] Allow just a single test to be run
by atagar＠torproject.org 03 Mar '15

03 Mar '15

commit 55bfd9c10ff8d8c1dc418a06ab43f05a8d581d41 Merge: b8411f0 230a8aa Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 3 09:30:15 2015 -0800 Allow just a single test to be run Our run_tests.py's '--test' argument can now be giving a single test to just run that. For example... ./run_tests.py --unit --test test.unit.util.conf.test_parse_enum_csv -v The 'test.unit.' or 'test.integ.' prefix is optional. Initial patch thanks to civ! https://trac.torproject.org/projects/tor/ticket/14944 run_tests.py | 27 +++++++++++++++++++-------- test/util.py | 45 ++++++++++++++++++++++----------------------- 2 files changed, 41 insertions(+), 31 deletions(-)

1 0

[stem/master] Rename module_substring to module_prefix
by atagar＠torproject.org 03 Mar '15

03 Mar '15

commit ecee95a9b31d55fdb9699cc4d9c3025f62f86430 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 3 08:38:56 2015 -0800 Rename module_substring to module_prefix With the new behavior it's effectively doing a prefix check rather than substring (since it adds 'test.unit.' or 'test.integ.'). This is fine. Just renaming things to be accurate. --- test/util.py | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/test/util.py b/test/util.py index 9a768d5..78be64b 100644 --- a/test/util.py +++ b/test/util.py @@ -75,40 +75,44 @@ Target = stem.util.enum.UppercaseEnum( STEM_BASE = os.path.sep.join(__file__.split(os.path.sep)[:-2]) -def get_unit_tests(module_substring = None): +def get_unit_tests(module_prefix = None): """ Provides the classes for our unit tests. - :param str module_substring: only provide the test if the module includes this substring + :param str module_prefix: only provide the test if the module starts with + this substring :returns: an **iterator** for our unit tests """ - if module_substring and module_substring.startswith('test.unit.') == False: - module_substring = 'test.unit.' + module_substring - return _get_tests(CONFIG['test.unit_tests'].splitlines(), module_substring) + if module_prefix and not module_prefix.startswith('test.unit.'): + module_prefix = 'test.unit.' + module_prefix + return _get_tests(CONFIG['test.unit_tests'].splitlines(), module_prefix) -def get_integ_tests(module_substring = None): + +def get_integ_tests(module_prefix = None): """ Provides the classes for our integration tests. - :param str module_substring: only provide the test if the module includes this substring + :param str module_prefix: only provide the test if the module starts with + this substring :returns: an **iterator** for our integration tests """ - if module_substring and module_substring.startswith('test.integ.') == False: - module_substring = 'test.integ.' + module_substring - return _get_tests(CONFIG['test.integ_tests'].splitlines(), module_substring) + if module_prefix and not module_prefix.startswith('test.integ.'): + module_prefix = 'test.integ.' + module_prefix + + return _get_tests(CONFIG['test.integ_tests'].splitlines(), module_prefix) -def _get_tests(modules, module_substring): - # Look for module_substring in the list of all modules +def _get_tests(modules, module_prefix): + # Look for module_prefix in the list of all modules modules_found = 0 for import_name in modules: if import_name: - if module_substring and module_substring not in import_name: + if module_prefix and not import_name.startswith(module_prefix): continue modules_found += 1 @@ -118,15 +122,15 @@ def _get_tests(modules, module_substring): # a method (e.g test.integ.process.some_method). # Delete the method substring and look again in the list of modules if modules_found == 0: - module_list = module_substring.split('.') - # At this point all module_substring should be test.{integ|unit}.something + module_list = module_prefix.split('.') + # At this point all module_prefix should be test.{integ|unit}.something if(len(module_list) > 3): - module_substring = '.'.join(module_list[:-1]) + module_prefix = '.'.join(module_list[:-1]) class_method = module_list[-1] for import_name in modules: if import_name: - if module_substring and module_substring not in import_name: + if module_prefix and not import_name.startswith(module_prefix): continue # If found, return module.method

1 0

[stem/master] Clear orphaned pyc files for python3
by atagar＠torproject.org 02 Mar '15

02 Mar '15

commit b8411f0dafab408f42f2b00ab6622fa64c6d120d Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 2 09:23:07 2015 -0800 Clear orphaned pyc files for python3 Task to ensure we don't test against bytecode for deleted or renamed files. Initial patch thanks to dumindux. https://trac.torproject.org/projects/tor/ticket/14628 --- stem/util/test_tools.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index 2e4dd0b..c8fe76a 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -53,17 +53,22 @@ def clean_orphaned_pyc(paths): for path in paths: for pyc_path in stem.util.system.files_with_suffix(path, '.pyc'): + py_path = pyc_path[:-1] + # If we're running python 3 then the *.pyc files are no longer bundled # with the *.py. Rather, they're in a __pycache__ directory. - # TODO: At the moment there's no point in checking for orphaned bytecode - # with python 3 because it's an exported copy of the python 2 codebase, - # so skipping. However, we might want to address this for other callers. + pycache = '%s__pycache__%s' % (os.path.sep, os.path.sep) + + if pycache in pyc_path: + directory, pycache_filename = pyc_path.split(pycache, 1) + + if not pycache_filename.endswith('.pyc'): + continue # should look like 'test_tools.cpython-32.pyc' - if '__pycache__' in pyc_path: - continue + py_path = os.path.join(directory, pycache_filename.split('.')[0] + '.py') - if not os.path.exists(pyc_path[:-1]): + if not os.path.exists(py_path): orphaned_pyc.append(pyc_path) os.remove(pyc_path)

1 0

[tor/master] Fix formatting
by andrea＠torproject.org 02 Mar '15

02 Mar '15

commit d97f43dc8bbc50272f89d26c2bd1a22b1cc6e5d8 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Mar 2 10:24:58 2015 +0000 Fix formatting --- src/common/container.h | 1 - src/test/test_status.c | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/common/container.h b/src/common/container.h index d07697f..457b5e4 100644 --- a/src/common/container.h +++ b/src/common/container.h @@ -256,7 +256,6 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join, --var ## _sl_len; \ STMT_END - /** Helper: While in a SMARTLIST_FOREACH loop over the list sl indexed * with the variable var, replace the current element with val. * Does not deallocate the current value of var. diff --git a/src/test/test_status.c b/src/test/test_status.c index 0aa82ca..cb3b4f6 100644 --- a/src/test/test_status.c +++ b/src/test/test_status.c @@ -878,7 +878,8 @@ NS(logv)(int severity, log_domain_mask_t domain, const char *funcname, tt_ptr_op(strstr(funcname, "log_heartbeat"), OP_NE, NULL); tt_ptr_op(suffix, OP_EQ, NULL); tt_str_op(format, OP_EQ, - "Average packaged cell fullness: %2.3f%%. TLS write overhead: %.f%%"); + "Average packaged cell fullness: %2.3f%%. " + "TLS write overhead: %.f%%"); tt_double_op(fabs(va_arg(ap, double) - 50.0), <=, DBL_EPSILON); tt_double_op(fabs(va_arg(ap, double) - 0.0), <=, DBL_EPSILON); break; @@ -1026,7 +1027,8 @@ NS(logv)(int severity, log_domain_mask_t domain, tt_ptr_op(strstr(funcname, "log_heartbeat"), OP_NE, NULL); tt_ptr_op(suffix, OP_EQ, NULL); tt_str_op(format, OP_EQ, - "Average packaged cell fullness: %2.3f%%. TLS write overhead: %.f%%"); + "Average packaged cell fullness: %2.3f%%. " + "TLS write overhead: %.f%%"); tt_int_op(fabs(va_arg(ap, double) - 100.0) <= DBL_EPSILON, OP_EQ, 1); tt_double_op(fabs(va_arg(ap, double) - 100.0), <=, DBL_EPSILON); break;

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 02 Mar '15

02 Mar '15

commit 2142f8e54ba2063cd5a2b7c7ca234e4ab77df95f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 2 02:48:18 2015 +0000 Update translations for torbutton-torbuttonproperties --- it/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/torbutton.properties b/it/torbutton.properties index 47a4773..678357f 100644 --- a/it/torbutton.properties +++ b/it/torbutton.properties @@ -51,7 +51,7 @@ torbutton.popup.short_torbrowser = Informazioni importanti su Torbutton!\n\nTorb torbutton.popup.confirm_plugins = Alcuni plugin come Flash possono violare la tua privacy e anonimità.\n\nPossono anche eludere Tor per rivelare la tua posizione attuale e il tuo indirizzo IP.\n\nSei sicuro di volere attivare i plugin?\n torbutton.popup.never_ask_again = Non chiedermelo più -torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n +torbutton.popup.confirm_newnym = Tor Browser chiuderà tutte le schede e finestre. Tutte le sezioni dei siti andranno perse.\n\nRiavviare ora Tor Browser per azzerare la tua identità?\n\n # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Questo sito (%S) tentato di estrarre i dati di immagine HTML5 canvas, che possono essere utilizzati per identificare in modo univoco il computer.\n\nPermettere a Tor Browser di estrarre l'immagine HTML5 canvas per questo sito?

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 02 Mar '15

02 Mar '15

commit 1141c1c3fd28057827c7fd447dfb27f423714df8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 2 02:48:05 2015 +0000 Update translations for tails-misc_completed --- it.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it.po b/it.po index 44305b5..864061f 100644 --- a/it.po +++ b/it.po @@ -23,7 +23,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-23 16:25+0100\n" -"PO-Revision-Date: 2015-03-02 02:14+0000\n" +"PO-Revision-Date: 2015-03-02 02:20+0000\n" "Last-Translator: HostFat <hostfat(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n"

1 0