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

[stem/master] Import tests so they can report asynchronisity
by atagar＠torproject.org 17 Jun '17

17 Jun '17

commit 30ac0298fae3a9b16018fc419bc616222cc997aa Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 16 11:10:13 2017 -0700 Import tests so they can report asynchronisity Last change was nice, but by dropping explicit imports for our aynchronous tests they weren't loaded until their invocation. This in turn meant they could't report that they were asynchronous. Adding a simple task that ensures all our test modules are imported. --- run_tests.py | 1 + test/task.py | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/run_tests.py b/run_tests.py index 22a0229..9701178 100755 --- a/run_tests.py +++ b/run_tests.py @@ -200,6 +200,7 @@ def main(): test.task.PYCODESTYLE_VERSION, test.task.CLEAN_PYC, test.task.UNUSED_TESTS, + test.task.IMPORT_TESTS, test.task.PYFLAKES_TASK if not args.specific_test else None, test.task.PYCODESTYLE_TASK if not args.specific_test else None, ) diff --git a/test/task.py b/test/task.py index c647736..ada9062 100644 --- a/test/task.py +++ b/test/task.py @@ -16,6 +16,7 @@ |- PYFLAKES_VERSION - checks our version of pyflakes |- PYCODESTYLE_VERSION - checks our version of pycodestyle |- CLEAN_PYC - removes any *.pyc without a corresponding *.py + |- IMPORT_TESTS - ensure all test modules have been imported |- UNUSED_TESTS - checks to see if any tests are missing from our settings |- PYFLAKES_TASK - static checks +- PYCODESTYLE_TASK - style checks @@ -75,6 +76,16 @@ def _clean_orphaned_pyc(paths): return ['removed %s' % path for path in stem.util.test_tools.clean_orphaned_pyc(paths)] +def _import_tests(): + """ + Ensure all tests have been imported. This is important so tests can + register if they're asynchronous. + """ + + for module in (CONFIG['test.unit_tests'].splitlines() + CONFIG['test.integ_tests'].splitlines()): + importlib.import_module(module.rsplit('.', 1)[0]) + + def _check_for_unused_tests(paths): """ The 'test.unit_tests' and 'test.integ_tests' in our settings.cfg defines the @@ -183,7 +194,7 @@ class Task(object): self.is_successful = True output_msg = 'running' if self._is_background_task else 'done' - if self.print_result and isinstance(self.result, str): + if self.result and self.print_result and isinstance(self.result, str): output_msg = self.result elif self.print_runtime: output_msg += ' (%0.1fs)' % (time.time() - start_time) @@ -247,12 +258,13 @@ PYNACL_VERSION = ModuleVersion('checking pynacl version', 'nacl', stem.prereq._i MOCK_VERSION = ModuleVersion('checking mock version', ['unittest.mock', 'mock'], stem.prereq.is_mock_available) PYFLAKES_VERSION = ModuleVersion('checking pyflakes version', 'pyflakes') PYCODESTYLE_VERSION = ModuleVersion('checking pycodestyle version', ['pycodestyle', 'pep8']) -CLEAN_PYC = Task('checking for orphaned .pyc files', _clean_orphaned_pyc, (SRC_PATHS,)) +CLEAN_PYC = Task('checking for orphaned .pyc files', _clean_orphaned_pyc, (SRC_PATHS,), print_runtime = True) +IMPORT_TESTS = Task('importing test modules', _import_tests, print_runtime = True) UNUSED_TESTS = Task('checking for unused tests', _check_for_unused_tests, [( os.path.join(test.STEM_BASE, 'test', 'unit'), os.path.join(test.STEM_BASE, 'test', 'integ'), -)]) +)], print_runtime = True) PYFLAKES_TASK = StaticCheckTask( 'running pyflakes',

1 0

[stem/master] Invoke asynchronous test's run_tests dynamically
by atagar＠torproject.org 17 Jun '17

17 Jun '17

commit ce50d1de2771939058e120db977a649e231190f6 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 13 19:59:18 2017 -0700 Invoke asynchronous test's run_tests dynamically For any module using @asynchronous there's a run_tests() function to start them. Rather than hardcoding all these calls doing so dynamically. --- run_tests.py | 31 +++++++++------------------ test/__init__.py | 2 ++ test/integ/descriptor/extrainfo_descriptor.py | 4 ++-- test/integ/descriptor/microdescriptor.py | 4 ++-- test/integ/descriptor/networkstatus.py | 6 +++--- test/integ/descriptor/server_descriptor.py | 4 ++-- test/integ/installation.py | 2 +- test/integ/process.py | 4 ++-- 8 files changed, 24 insertions(+), 33 deletions(-) diff --git a/run_tests.py b/run_tests.py index 58f9ffa..22a0229 100755 --- a/run_tests.py +++ b/run_tests.py @@ -6,6 +6,7 @@ Runs unit and integration tests. For usage information run this with '--help'. """ +import importlib import os import sys import threading @@ -27,12 +28,6 @@ import stem.version import test import test.arguments -import test.integ.descriptor.extrainfo_descriptor -import test.integ.descriptor.microdescriptor -import test.integ.descriptor.networkstatus -import test.integ.descriptor.server_descriptor -import test.integ.installation -import test.integ.process import test.output import test.runner import test.task @@ -234,24 +229,18 @@ def main(): if args.run_integ: default_test_dir = stem.util.system.expand_path(CONFIG['integ.test_directory'], test.STEM_BASE) + async_args = test.AsyncTestArgs(default_test_dir, args.tor_path) - if not args.specific_test or 'test.integ.descriptor.extrainfo_descriptor'.startswith(args.specific_test): - test.integ.descriptor.extrainfo_descriptor.TestExtraInfoDescriptor.run_tests(default_test_dir) + for module_str in stem.util.test_tools.ASYNC_TESTS: + if not args.specific_test or module_str.startswith(args.specific_test): + module = importlib.import_module(module_str.rsplit('.', 1)[0]) + test_classes = [v for k, v in module.__dict__.items() if k.startswith('Test')] - if not args.specific_test or 'test.integ.descriptor.microdescriptor'.startswith(args.specific_test): - test.integ.descriptor.microdescriptor.TestMicrodescriptor.run_tests(default_test_dir) + if len(test_classes) != 1: + print('BUG: Detected multiple tests for %s: %s' % (module_str, ', '.join(test_classes))) + sys.exit(1) - if not args.specific_test or 'test.integ.descriptor.networkstatus'.startswith(args.specific_test): - test.integ.descriptor.networkstatus.TestNetworkStatus.run_tests(default_test_dir) - - if not args.specific_test or 'test.integ.descriptor.server_descriptor'.startswith(args.specific_test): - test.integ.descriptor.server_descriptor.TestServerDescriptor.run_tests(default_test_dir) - - if not args.specific_test or 'test.integ.installation'.startswith(args.specific_test): - test.integ.installation.TestInstallation.run_tests() - - if not args.specific_test or 'test.integ.process'.startswith(args.specific_test): - test.integ.process.TestProcess.run_tests(args.tor_path) + test_classes[0].run_tests(async_args) if args.run_unit: test.output.print_divider('UNIT TESTS', True) diff --git a/test/__init__.py b/test/__init__.py index 8b5d576..5a4c6e9 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -13,6 +13,7 @@ Unit and integration tests for the stem library. Helpers include... tor_version - provides the version of tor we're testing against """ +import collections import itertools import os @@ -50,6 +51,7 @@ Target = stem.util.enum.UppercaseEnum( 'RUN_ALL', ) +AsyncTestArgs = collections.namedtuple('AsyncTestArgs', ['test_dir', 'tor_cmd']) TOR_VERSION = None # We make some paths relative to stem's base directory (the one above us) diff --git a/test/integ/descriptor/extrainfo_descriptor.py b/test/integ/descriptor/extrainfo_descriptor.py index 0e13435..c0a4d30 100644 --- a/test/integ/descriptor/extrainfo_descriptor.py +++ b/test/integ/descriptor/extrainfo_descriptor.py @@ -14,8 +14,8 @@ from stem.util.test_tools import asynchronous class TestExtraInfoDescriptor(unittest.TestCase): @staticmethod - def run_tests(test_dir): - stem.util.test_tools.ASYNC_TESTS['test.integ.descriptor.extrainfo_descriptor.test_cached_descriptor'].run(test_dir, threaded = True) + def run_tests(args): + stem.util.test_tools.ASYNC_TESTS['test.integ.descriptor.extrainfo_descriptor.test_cached_descriptor'].run(args.test_dir, threaded = True) @asynchronous def test_cached_descriptor(test_dir): diff --git a/test/integ/descriptor/microdescriptor.py b/test/integ/descriptor/microdescriptor.py index 8987906..3f2b20c 100644 --- a/test/integ/descriptor/microdescriptor.py +++ b/test/integ/descriptor/microdescriptor.py @@ -14,8 +14,8 @@ from stem.util.test_tools import asynchronous class TestMicrodescriptor(unittest.TestCase): @staticmethod - def run_tests(test_dir): - stem.util.test_tools.ASYNC_TESTS['test.integ.descriptor.microdescriptor.test_cached_microdescriptors'].run(test_dir, threaded = True) + def run_tests(args): + stem.util.test_tools.ASYNC_TESTS['test.integ.descriptor.microdescriptor.test_cached_microdescriptors'].run(args.test_dir, threaded = True) @asynchronous def test_cached_microdescriptors(test_dir): diff --git a/test/integ/descriptor/networkstatus.py b/test/integ/descriptor/networkstatus.py index dee8e7a..81eea54 100644 --- a/test/integ/descriptor/networkstatus.py +++ b/test/integ/descriptor/networkstatus.py @@ -19,9 +19,9 @@ from stem.util.test_tools import asynchronous class TestNetworkStatus(unittest.TestCase): @staticmethod - def run_tests(test_dir): - stem.util.test_tools.ASYNC_TESTS['test.integ.descriptor.networkstatus.test_cached_consensus'].run(test_dir, threaded = True) - stem.util.test_tools.ASYNC_TESTS['test.integ.descriptor.networkstatus.test_cached_microdesc_consensus'].run(test_dir, threaded = True) + def run_tests(args): + stem.util.test_tools.ASYNC_TESTS['test.integ.descriptor.networkstatus.test_cached_consensus'].run(args.test_dir, threaded = True) + stem.util.test_tools.ASYNC_TESTS['test.integ.descriptor.networkstatus.test_cached_microdesc_consensus'].run(args.test_dir, threaded = True) @test.require.only_run_once @test.require.online diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index a4a78ac..a62ee8f 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -14,8 +14,8 @@ from stem.util.test_tools import asynchronous class TestServerDescriptor(unittest.TestCase): @staticmethod - def run_tests(test_dir): - stem.util.test_tools.ASYNC_TESTS['test.integ.descriptor.server_descriptor.test_cached_descriptor'].run(test_dir, threaded = True) + def run_tests(args): + stem.util.test_tools.ASYNC_TESTS['test.integ.descriptor.server_descriptor.test_cached_descriptor'].run(args.test_dir, threaded = True) @asynchronous def test_cached_descriptor(test_dir): diff --git a/test/integ/installation.py b/test/integ/installation.py index 82bc717..e52cc63 100644 --- a/test/integ/installation.py +++ b/test/integ/installation.py @@ -57,7 +57,7 @@ def _assert_has_all_files(path): class TestInstallation(unittest.TestCase): @staticmethod - def run_tests(): + def run_tests(args): test_install = stem.util.test_tools.ASYNC_TESTS['test.integ.installation.test_install'] test_install.run() stem.util.test_tools.ASYNC_TESTS['test.integ.installation.test_sdist'].run(test_install.pid()) diff --git a/test/integ/process.py b/test/integ/process.py index 9ee96ad..6fb101c 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -103,10 +103,10 @@ def run_tor(tor_cmd, *args, **kwargs): class TestProcess(unittest.TestCase): @staticmethod - def run_tests(tor_cmd): + def run_tests(args): for func, async_test in stem.util.test_tools.ASYNC_TESTS.items(): if func.startswith('test.integ.process.'): - async_test.run(tor_cmd) + async_test.run(args.tor_cmd) @asynchronous def test_version_argument(tor_cmd):

1 0

[metrics-web/master] Update to metrics-lib 1.8.2.
by karsten＠torproject.org 17 Jun '17

17 Jun '17

commit 4e3840991ae720aba11ec814e4eaf02db762e095 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Jun 17 17:42:55 2017 +0200 Update to metrics-lib 1.8.2. --- shared/build-base.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/build-base.xml b/shared/build-base.xml index f0ec381..f473b77 100644 --- a/shared/build-base.xml +++ b/shared/build-base.xml @@ -8,7 +8,7 @@ <property name="classes" value="${generated}/classes/"/> <property name="testclasses" value="${generated}/test-classes/"/> <property name="source-and-target-java-version" value="1.7" /> - <property name="descriptorversion" value="1.8.0" /> + <property name="descriptorversion" value="1.8.2" /> <path id="base.classpath"> <pathelement path="${classes}"/>

1 0

[exonerator/master] Update to metrics-lib 1.8.2.
by karsten＠torproject.org 17 Jun '17

17 Jun '17

commit a3deabfaa782727aca5b50873972c675512e2d0a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Jun 17 17:08:56 2017 +0200 Update to metrics-lib 1.8.2. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 27500d4..625be4a 100644 --- a/build.xml +++ b/build.xml @@ -12,7 +12,7 @@ <property name="webxmlfile" value="src/main/webapp/web.xml"/> <property name="warfile" value="${dist}/exonerator.war"/> <property name="source-and-target-java-version" value="1.7" /> - <property name="descriptorversion" value="1.8.0" /> + <property name="descriptorversion" value="1.8.2" /> <path id="classpath"> <pathelement path="${classes}"/> <fileset dir="${libs}">

1 0

[collector/master] Update to metrics-lib 1.8.2.
by karsten＠torproject.org 17 Jun '17

17 Jun '17

commit 7ef5c4b135c7975273b4a92d4539cfc703d08ccf Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Jun 17 08:55:23 2017 +0200 Update to metrics-lib 1.8.2. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index c7d8f95..729dbb0 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="release.version" value="1.1.2-dev" /> <property name="project-main-class" value="org.torproject.collector.Main" /> <property name="name" value="collector"/> - <property name="descriptorversion" value="1.8.1" /> + <property name="descriptorversion" value="1.8.2" /> <property name="jarincludes" value="collector.properties logback.xml" /> <patternset id="runtime" >

1 0

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

17 Jun '17

commit 2842aba0ec9e979b70bbbb282e233d32ae4c7662 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 17 13:45:32 2017 +0000 Update translations for liveusb-creator --- tr/tr.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index f609b6d..1878248 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Ali Kömesöğütlü <byzlo685(a)gmail.com>, 2017 # Ayca Omrak <aycaom(a)hotmail.com>, 2013 # banu arı <banu-ari(a)hotmail.com>, 2015 # Emir Sarı <bitigchi(a)openmailbox.org>, 2014 @@ -20,9 +21,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-09 17:50+0200\n" -"PO-Revision-Date: 2017-06-10 01:55+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2017-06-10 07:50+0200\n" +"PO-Revision-Date: 2017-06-17 13:27+0000\n" +"Last-Translator: Ali Kömesöğütlü <byzlo685(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -517,7 +518,7 @@ msgstr "" #: ../data/tails-installer-launcher.ui.h:2 msgid "Install" -msgstr "" +msgstr "Yükle" #: ../data/tails-installer-launcher.ui.h:3 msgid "• Install Tails on a new USB stick." @@ -529,7 +530,7 @@ msgstr "" #: ../data/tails-installer-launcher.ui.h:5 msgid "Upgrade" -msgstr "" +msgstr "Güncelle" #: ../data/tails-installer-launcher.ui.h:6 msgid "• Upgrade a Tails USB stick to the version of an ISO image." @@ -575,7 +576,7 @@ msgstr "" #: ../data/tails-installer-launcher.ui.h:14 msgid "Upgrade from ISO" -msgstr "" +msgstr "ISO'dan yükselt" #: ../data/tails-installer-launcher.ui.h:15 msgid "• Upgrade another Tails USB stick to the version of an ISO image."

1 0

[onionoo/master] Update to metrics-lib 1.8.2.
by karsten＠torproject.org 17 Jun '17

17 Jun '17

commit 8c197db5a654020cf73ad87613750d431ef503e3 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Jun 17 08:51:34 2017 +0200 Update to metrics-lib 1.8.2. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 74e81e5..c498a5d 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="onionoo.protocol.version" value="4.0"/> <property name="release.version" value="${onionoo.protocol.version}-1.2.0-dev"/> - <property name="descriptorversion" value="1.8.0"/> + <property name="descriptorversion" value="1.8.2"/> <property name="jetty.version" value="-8.1.16.v20140903" /> <property name="warfile" value="onionoo-${release.version}.war"/>

1 0

[onionoo/master] Hotfix for #22594.
by karsten＠torproject.org 17 Jun '17

17 Jun '17

commit 907360f9d045eb0f062d0bc0322862e63358dd94 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jun 14 21:50:21 2017 +0200 Hotfix for #22594. --- src/main/java/org/torproject/onionoo/docs/DocumentStore.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java index 34bc8ef..56ca406 100644 --- a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java @@ -537,8 +537,9 @@ public class DocumentStore { Gson gson = new Gson(); try { result = gson.fromJson(documentString, documentType); - } catch (JsonParseException e) { + } catch (Throwable e) { /* Handle below. */ + log.error(documentString); log.error(e.getMessage(), e); } if (result == null) {

1 0

[translation/tor-messenger-privproperties_completed] Update translations for tor-messenger-privproperties_completed
by translation＠torproject.org 17 Jun '17

17 Jun '17

commit f10e154344da3a784c7f0bb1a96b4f50772306de Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 17 05:48:13 2017 +0000 Update translations for tor-messenger-privproperties_completed --- lo/priv.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lo/priv.properties b/lo/priv.properties new file mode 100644 index 0000000..d578ffd --- /dev/null +++ b/lo/priv.properties @@ -0,0 +1,2 @@ +priv.account=ກຳລັງສ້າງ ລະຫັດກຸນແຈສ່ວນຕົວໃຫ້ກັບ %S (%S) ... +priv.failed=ການສ້າງລະຫັດກຸນແຈ: %S ລົ້ມເຫຼວ

1 0

[translation/tor-messenger-privproperties] Update translations for tor-messenger-privproperties
by translation＠torproject.org 17 Jun '17

17 Jun '17

commit 8a06fb55b6863a0c3ce8fec3dcb3de0b023c3477 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 17 05:48:09 2017 +0000 Update translations for tor-messenger-privproperties --- lo/priv.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lo/priv.properties b/lo/priv.properties index f8a9f15..d578ffd 100644 --- a/lo/priv.properties +++ b/lo/priv.properties @@ -1,2 +1,2 @@ -priv.account=Generating private key for %S (%S) ... -priv.failed=Generating key failed: %S +priv.account=ກຳລັງສ້າງ ລະຫັດກຸນແຈສ່ວນຕົວໃຫ້ກັບ %S (%S) ... +priv.failed=ການສ້າງລະຫັດກຸນແຈ: %S ລົ້ມເຫຼວ

1 0