tor-commits June 2017

tor-commits@lists.torproject.org

13 participants
1918 discussions

[stem/master] Perform async tests last
by atagar＠torproject.org 08 Jun '17

08 Jun '17

commit 72dc457e5c8fbeb25c5b6ff43902d780958859aa Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jun 5 10:52:04 2017 -0700 Perform async tests last Running our async tests last to give them the most amount of time to finish in the background. --- test/settings.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/settings.cfg b/test/settings.cfg index 5740f1b..4ba2f12 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -226,7 +226,6 @@ test.integ_tests |test.integ.util.connection.TestConnection |test.integ.util.proc.TestProc |test.integ.util.system.TestSystem -|test.integ.installation.TestInstallation |test.integ.interpreter.TestInterpreter |test.integ.descriptor.remote.TestDescriptorDownloader |test.integ.descriptor.server_descriptor.TestServerDescriptor @@ -236,11 +235,12 @@ test.integ_tests |test.integ.version.TestVersion |test.integ.manual.TestManual |test.integ.response.protocolinfo.TestProtocolInfo -|test.integ.process.TestProcess |test.integ.socket.control_socket.TestControlSocket |test.integ.socket.control_message.TestControlMessage |test.integ.connection.authentication.TestAuthenticate |test.integ.connection.connect.TestConnect |test.integ.control.base_controller.TestBaseController |test.integ.control.controller.TestController +|test.integ.installation.TestInstallation +|test.integ.process.TestProcess

1 0

[stem/master] Parallelize descriptor cache tests
by atagar＠torproject.org 08 Jun '17

08 Jun '17

commit 34eaf109d6610e7fbc887c06df1a20367207c81d Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jun 5 14:37:42 2017 -0700 Parallelize descriptor cache tests We have a handful of lengthy tests that read descriptors from our data directory. Running these in the background. --- run_tests.py | 19 ++++++++++++++ stem/util/test_tools.py | 17 +++++++------ test/integ/descriptor/extrainfo_descriptor.py | 25 +++++++++++-------- test/integ/descriptor/microdescriptor.py | 16 ++++++------ test/integ/descriptor/networkstatus.py | 36 +++++++++++++++------------ test/integ/descriptor/server_descriptor.py | 23 +++++++++-------- test/integ/installation.py | 2 +- test/integ/process.py | 8 +++--- test/settings.cfg | 10 ++++---- 9 files changed, 94 insertions(+), 62 deletions(-) diff --git a/run_tests.py b/run_tests.py index 961600c..0a162eb 100755 --- a/run_tests.py +++ b/run_tests.py @@ -28,6 +28,10 @@ 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 @@ -37,6 +41,7 @@ import test.task from test.output import STATUS, SUCCESS, ERROR, NO_NL, STDERR, println CONFIG = stem.util.conf.config_dict('test', { + 'integ.test_directory': './test/data', 'test.unit_tests': '', 'test.integ_tests': '', 'target.prereq': {}, @@ -234,6 +239,20 @@ def main(): skipped_tests = 0 if args.run_integ: + default_test_dir = stem.util.system.expand_path(CONFIG['integ.test_directory'], test.STEM_BASE) + + 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) + + 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 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() diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index 5a5813f..0d167d0 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -80,10 +80,10 @@ class AsyncTest(object): .. versionadded:: 1.6.0 """ - def __init__(self, test_runner, *test_runner_args): - def _wrapper(conn, runner, args): + def __init__(self, test_runner, args = None, threaded = False): + def _wrapper(conn, runner, test_args): try: - runner(*args) if args else runner() + runner(*test_args) if test_args else runner() conn.send(('success', None)) except AssertionError as exc: conn.send(('failure', str(exc))) @@ -92,14 +92,17 @@ class AsyncTest(object): finally: conn.close() - # method that can be mixed into TestCases - - self.method = lambda test: self.result(test) + self.method = lambda test: self.result(test) # method that can be mixed into TestCases self._result_type, self._result_msg = None, None self._result_lock = threading.RLock() self._results_pipe, child_pipe = multiprocessing.Pipe() - self._test_process = multiprocessing.Process(target = _wrapper, args = (child_pipe, test_runner, test_runner_args)) + + if threaded: + self._test_process = threading.Thread(target = _wrapper, args = (child_pipe, test_runner, args)) + else: + self._test_process = multiprocessing.Process(target = _wrapper, args = (child_pipe, test_runner, args)) + self._test_process.start() def pid(self): diff --git a/test/integ/descriptor/extrainfo_descriptor.py b/test/integ/descriptor/extrainfo_descriptor.py index eada1d7..e2350ce 100644 --- a/test/integ/descriptor/extrainfo_descriptor.py +++ b/test/integ/descriptor/extrainfo_descriptor.py @@ -6,25 +6,28 @@ import os import unittest import stem.descriptor +import stem.util.test_tools import test import test.require -import test.runner class TestExtraInfoDescriptor(unittest.TestCase): - @test.require.only_run_once - def test_cached_descriptor(self): + @staticmethod + def run_tests(test_dir): + TestExtraInfoDescriptor.test_cached_descriptor = stem.util.test_tools.AsyncTest(TestExtraInfoDescriptor.test_cached_descriptor, args = (test_dir,), threaded = True).method + + @staticmethod + def test_cached_descriptor(test_dir): """ Parses the cached descriptor file in our data directory, checking that it doesn't raise any validation issues and looking for unrecognized descriptor additions. """ - descriptor_path = test.runner.get_runner().get_test_dir('cached-extrainfo') + descriptor_path = os.path.join(test_dir, 'cached-extrainfo') if not os.path.exists(descriptor_path): - self.skipTest('(no cached descriptors)') - return + raise stem.util.test_tools.SkipTest('(no cached descriptors)') with open(descriptor_path, 'rb') as descriptor_file: for desc in stem.descriptor.parse_file(descriptor_file, 'extra-info 1.0', validate = True): @@ -32,12 +35,12 @@ class TestExtraInfoDescriptor(unittest.TestCase): test.register_new_capability('Extra-info Line', line) if desc.dir_v2_responses_unknown: - self.fail('Unrecognized statuses on dirreq-v2-resp lines: %s' % desc.dir_v2_responses_unknown) + raise AssertionError('Unrecognized statuses on dirreq-v2-resp lines: %s' % desc.dir_v2_responses_unknown) elif desc.dir_v3_responses_unknown: - self.fail('Unrecognized statuses on dirreq-v3-resp lines: %s' % desc.dir_v3_responses_unknown) + raise AssertionError('Unrecognized statuses on dirreq-v3-resp lines: %s' % desc.dir_v3_responses_unknown) elif desc.dir_v2_direct_dl_unknown: - self.fail('Unrecognized stats on dirreq-v2-direct-dl lines: %s' % desc.dir_v2_direct_dl_unknown) + raise AssertionError('Unrecognized stats on dirreq-v2-direct-dl lines: %s' % desc.dir_v2_direct_dl_unknown) elif desc.dir_v3_direct_dl_unknown: - self.fail('Unrecognized stats on dirreq-v3-direct-dl lines: %s' % desc.dir_v2_direct_dl_unknown) + raise AssertionError('Unrecognized stats on dirreq-v3-direct-dl lines: %s' % desc.dir_v2_direct_dl_unknown) elif desc.dir_v2_tunneled_dl_unknown: - self.fail('Unrecognized stats on dirreq-v2-tunneled-dl lines: %s' % desc.dir_v2_tunneled_dl_unknown) + raise AssertionError('Unrecognized stats on dirreq-v2-tunneled-dl lines: %s' % desc.dir_v2_tunneled_dl_unknown) diff --git a/test/integ/descriptor/microdescriptor.py b/test/integ/descriptor/microdescriptor.py index a38917a..cc48fce 100644 --- a/test/integ/descriptor/microdescriptor.py +++ b/test/integ/descriptor/microdescriptor.py @@ -6,25 +6,27 @@ import os import unittest import stem.descriptor +import stem.util.test_tools import test -import test.require -import test.runner class TestMicrodescriptor(unittest.TestCase): - @test.require.only_run_once - def test_cached_microdescriptors(self): + @staticmethod + def run_tests(test_dir): + TestMicrodescriptor.test_cached_microdescriptors = stem.util.test_tools.AsyncTest(TestMicrodescriptor.test_cached_microdescriptors, args = (test_dir,), threaded = True).method + + @staticmethod + def test_cached_microdescriptors(test_dir): """ Parses the cached microdescriptor file in our data directory, checking that it doesn't raise any validation issues and looking for unrecognized descriptor additions. """ - descriptor_path = test.runner.get_runner().get_test_dir('cached-microdescs') + descriptor_path = os.path.join(test_dir, 'cached-microdescs') if not os.path.exists(descriptor_path): - self.skipTest('(no cached microdescriptors)') - return + raise stem.util.test_tools.SkipTest('(no cached descriptors)') with open(descriptor_path, 'rb') as descriptor_file: for desc in stem.descriptor.parse_file(descriptor_file, 'microdescriptor 1.0', validate = True): diff --git a/test/integ/descriptor/networkstatus.py b/test/integ/descriptor/networkstatus.py index 83383fd..46d7654 100644 --- a/test/integ/descriptor/networkstatus.py +++ b/test/integ/descriptor/networkstatus.py @@ -8,6 +8,7 @@ import unittest import stem import stem.descriptor import stem.descriptor.remote +import stem.util.test_tools import stem.version import test import test.require @@ -15,6 +16,11 @@ import test.runner class TestNetworkStatus(unittest.TestCase): + @staticmethod + def run_tests(test_dir): + TestNetworkStatus.test_cached_consensus = stem.util.test_tools.AsyncTest(TestNetworkStatus.test_cached_consensus, args = (test_dir,), threaded = True).method + TestNetworkStatus.test_cached_microdesc_consensus = stem.util.test_tools.AsyncTest(TestNetworkStatus.test_cached_microdesc_consensus, args = (test_dir,), threaded = True).method + @test.require.only_run_once @test.require.online @test.require.cryptography @@ -26,23 +32,21 @@ class TestNetworkStatus(unittest.TestCase): stem.descriptor.remote.get_consensus(document_handler = stem.descriptor.DocumentHandler.DOCUMENT, validate = True).run() - @test.require.only_run_once - def test_cached_consensus(self): + @staticmethod + def test_cached_consensus(test_dir): """ Parses the cached-consensus file in our data directory. """ - consensus_path = test.runner.get_runner().get_test_dir('cached-consensus') + consensus_path = os.path.join(test_dir, 'cached-consensus') if not os.path.exists(consensus_path): - self.skipTest('(no cached-consensus)') - return + raise stem.util.test_tools.SkipTest('(no cached-consensus)') elif stem.util.system.is_windows(): # Unable to check memory usage on windows, so can't prevent hanging the # system if things go bad. - self.skipTest('(unavailable on windows)') - return + raise stem.util.test_tools.SkipTest('(unavailable on windows)') count, reported_flags = 0, [] @@ -61,22 +65,21 @@ class TestNetworkStatus(unittest.TestCase): # Sanity test that there's at least a hundred relays. If that's not the # case then this probably isn't a real, complete tor consensus. - self.assertTrue(count > 100) + if count < 100: + raise AssertionError('%s only included %s relays' % (consensus_path, count)) - @test.require.only_run_once - def test_cached_microdesc_consensus(self): + @staticmethod + def test_cached_microdesc_consensus(test_dir): """ Parses the cached-microdesc-consensus file in our data directory. """ - consensus_path = test.runner.get_runner().get_test_dir('cached-microdesc-consensus') + consensus_path = os.path.join(test_dir, 'cached-microdesc-consensus') if not os.path.exists(consensus_path): - self.skipTest('(no cached-microdesc-consensus)') - return + raise stem.util.test_tools.SkipTest('(no cached-microdesc-consensus)') elif stem.util.system.is_windows(): - self.skipTest('(unavailable on windows)') - return + raise stem.util.test_tools.SkipTest('(unavailable on windows)') count, reported_flags = 0, [] @@ -92,4 +95,5 @@ class TestNetworkStatus(unittest.TestCase): for line in router.get_unrecognized_lines(): test.register_new_capability('Microdescriptor Consensus Line', line, suppression_token = line.split()[0]) - self.assertTrue(count > 100) + if count < 100: + raise AssertionError('%s only included %s relays' % (consensus_path, count)) diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index 7a234e3..0726c35 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -6,33 +6,34 @@ import os import unittest import stem.descriptor +import stem.util.test_tools import test -import test.require -import test.runner class TestServerDescriptor(unittest.TestCase): - @test.require.only_run_once - def test_cached_descriptor(self): + @staticmethod + def run_tests(test_dir): + TestServerDescriptor.test_cached_descriptor = stem.util.test_tools.AsyncTest(TestServerDescriptor.test_cached_descriptor, args = (test_dir,), threaded = True).method + + @staticmethod + def test_cached_descriptor(test_dir): """ Parses the cached descriptor file in our data directory, checking that it doesn't raise any validation issues and looking for unrecognized descriptor additions. """ - descriptor_path = test.runner.get_runner().get_test_dir('cached-descriptors') + descriptor_path = os.path.join(test_dir, 'cached-descriptors') if not os.path.exists(descriptor_path): - self.skipTest('(no cached descriptors)') - return + raise stem.util.test_tools.SkipTest('(no cached descriptors)') with open(descriptor_path, 'rb') as descriptor_file: for desc in stem.descriptor.parse_file(descriptor_file, 'server-descriptor 1.0', validate = True): # the following attributes should be deprecated, and not appear in the wild - self.assertEqual(None, desc.read_history_end) - self.assertEqual(None, desc.write_history_end) - self.assertEqual(None, desc.eventdns) - self.assertEqual(None, desc.socks_port) + + if desc.read_history_end or desc.write_history_end or desc.eventdns or desc.socks_port: + raise AssertionError('deprecated attribute appeared on: %s' % desc) for line in desc.get_unrecognized_lines(): test.register_new_capability('Server Descriptor Line', line) diff --git a/test/integ/installation.py b/test/integ/installation.py index 7cf5346..0253efd 100644 --- a/test/integ/installation.py +++ b/test/integ/installation.py @@ -58,7 +58,7 @@ class TestInstallation(unittest.TestCase): def run_tests(): test_install = stem.util.test_tools.AsyncTest(TestInstallation.test_install) TestInstallation.test_install = test_install.method - TestInstallation.test_sdist = stem.util.test_tools.AsyncTest(TestInstallation.test_sdist, test_install.pid()).method + TestInstallation.test_sdist = stem.util.test_tools.AsyncTest(TestInstallation.test_sdist, args = (test_install.pid(),)).method @staticmethod def test_install(): diff --git a/test/integ/process.py b/test/integ/process.py index 33e3927..09c51ed 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -48,10 +48,10 @@ def random_port(): class TestProcess(unittest.TestCase): @staticmethod def run_tests(tor_cmd): - TestProcess.test_launch_tor_with_config_via_file = stem.util.test_tools.AsyncTest(TestProcess.test_launch_tor_with_config_via_file, tor_cmd).method - TestProcess.test_launch_tor_with_config_via_stdin = stem.util.test_tools.AsyncTest(TestProcess.test_launch_tor_with_config_via_stdin, tor_cmd).method - TestProcess.test_take_ownership_via_pid = stem.util.test_tools.AsyncTest(TestProcess.test_take_ownership_via_pid, tor_cmd).method - TestProcess.test_take_ownership_via_controller = stem.util.test_tools.AsyncTest(TestProcess.test_take_ownership_via_controller, tor_cmd).method + TestProcess.test_launch_tor_with_config_via_file = stem.util.test_tools.AsyncTest(TestProcess.test_launch_tor_with_config_via_file, args = (tor_cmd,)).method + TestProcess.test_launch_tor_with_config_via_stdin = stem.util.test_tools.AsyncTest(TestProcess.test_launch_tor_with_config_via_stdin, args = (tor_cmd,)).method + TestProcess.test_take_ownership_via_pid = stem.util.test_tools.AsyncTest(TestProcess.test_take_ownership_via_pid, args = (tor_cmd,)).method + TestProcess.test_take_ownership_via_controller = stem.util.test_tools.AsyncTest(TestProcess.test_take_ownership_via_controller, args = (tor_cmd,)).method def setUp(self): self.data_directory = tempfile.mkdtemp() diff --git a/test/settings.cfg b/test/settings.cfg index 4ba2f12..52bd013 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -227,11 +227,6 @@ test.integ_tests |test.integ.util.proc.TestProc |test.integ.util.system.TestSystem |test.integ.interpreter.TestInterpreter -|test.integ.descriptor.remote.TestDescriptorDownloader -|test.integ.descriptor.server_descriptor.TestServerDescriptor -|test.integ.descriptor.extrainfo_descriptor.TestExtraInfoDescriptor -|test.integ.descriptor.microdescriptor.TestMicrodescriptor -|test.integ.descriptor.networkstatus.TestNetworkStatus |test.integ.version.TestVersion |test.integ.manual.TestManual |test.integ.response.protocolinfo.TestProtocolInfo @@ -241,6 +236,11 @@ test.integ_tests |test.integ.connection.connect.TestConnect |test.integ.control.base_controller.TestBaseController |test.integ.control.controller.TestController +|test.integ.descriptor.remote.TestDescriptorDownloader +|test.integ.descriptor.server_descriptor.TestServerDescriptor +|test.integ.descriptor.extrainfo_descriptor.TestExtraInfoDescriptor +|test.integ.descriptor.microdescriptor.TestMicrodescriptor +|test.integ.descriptor.networkstatus.TestNetworkStatus |test.integ.installation.TestInstallation |test.integ.process.TestProcess

1 0

[stem/master] Perform remaining process tests in the background
by atagar＠torproject.org 08 Jun '17

08 Jun '17

commit 874d9544fefc38620f959f83eec856001195b2dc Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 7 09:39:44 2017 -0700 Perform remaining process tests in the background Now that we no longer rely on our runner's torrc we can background the rest of our tests. There's one exception where we use mocks, but that doesn't actully invoke the tor process. This test module now takes ~7ms for me. --- test/integ/process.py | 86 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 36 deletions(-) diff --git a/test/integ/process.py b/test/integ/process.py index 44bc807..7e9542a 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -24,7 +24,6 @@ import stem.util.tor_tools import stem.version import test import test.require -import test.runner from stem.util.test_tools import asynchronous @@ -97,13 +96,6 @@ class TestProcess(unittest.TestCase): if func.startswith('test.integ.process.'): async_test.run(tor_cmd) - def setUp(self): - self.data_directory = tempfile.mkdtemp() - self.tor_cmd = test.runner.get_runner().get_tor_command() - - def tearDown(self): - shutil.rmtree(self.data_directory) - @asynchronous def test_version_argument(tor_cmd): """ @@ -197,56 +189,78 @@ class TestProcess(unittest.TestCase): if "[warn] Command-line option '--hash-password' with no value. Failing." not in output: raise AssertionError("'tor --hash-password' should require an argument") - def test_dump_config_argument(self): + @asynchronous + def test_dump_config_argument(tor_cmd): """ Exercises our 'tor --dump-config' arugments. """ - short_output = run_tor(self.tor_cmd, '--dump-config', 'short', with_torrc = True) - non_builtin_output = run_tor(self.tor_cmd, '--dump-config', 'non-builtin', with_torrc = True) - full_output = run_tor(self.tor_cmd, '--dump-config', 'full', with_torrc = True) - run_tor(self.tor_cmd, '--dump-config', 'invalid_option', with_torrc = True, expect_failure = True) + short_output = run_tor(tor_cmd, '--dump-config', 'short', with_torrc = True) + non_builtin_output = run_tor(tor_cmd, '--dump-config', 'non-builtin', with_torrc = True) + full_output = run_tor(tor_cmd, '--dump-config', 'full', with_torrc = True) + run_tor(tor_cmd, '--dump-config', 'invalid_option', with_torrc = True, expect_failure = True) + + if 'Nickname stemIntegTest' not in short_output: + raise AssertionError("Dumping short config options didn't include our nickname: %s" % short_output) + + if 'Nickname stemIntegTest' not in non_builtin_output: + raise AssertionError("Dumping non-builtin config options didn't include our nickname: %s" % non_builtin_output) - self.assertTrue('Nickname stemIntegTest' in short_output) - self.assertTrue('Nickname stemIntegTest' in non_builtin_output) - self.assertTrue('Nickname stemIntegTest' in full_output) + if 'Nickname stemIntegTest' not in full_output: + raise AssertionError("Dumping full config options didn't include our nickname: %s" % full_output) - def test_validate_config_argument(self): + @asynchronous + def test_validate_config_argument(tor_cmd): """ Exercises our 'tor --validate-config' argument. """ - valid_output = run_tor(self.tor_cmd, '--verify-config', with_torrc = True) - self.assertTrue('Configuration was valid\n' in valid_output) + valid_output = run_tor(tor_cmd, '--verify-config', with_torrc = True) + + if 'Configuration was valid\n' not in valid_output: + raise AssertionError('Expected configuration to be valid') - run_tor(self.tor_cmd, '--verify-config', '-f', __file__, expect_failure = True) + run_tor(tor_cmd, '--verify-config', '-f', __file__, expect_failure = True) - def test_list_fingerprint_argument(self): + @asynchronous + def test_list_fingerprint_argument(tor_cmd): """ Exercise our 'tor --list-fingerprint' argument. """ # This command should only work with a relay (which our test instance isn't). - output = run_tor(self.tor_cmd, '--list-fingerprint', with_torrc = True, expect_failure = True) - self.assertTrue("Clients don't have long-term identity keys. Exiting." in output) + output = run_tor(tor_cmd, '--list-fingerprint', with_torrc = True, expect_failure = True) - torrc_path = os.path.join(self.data_directory, 'torrc') + if "Clients don't have long-term identity keys. Exiting." not in output: + raise AssertionError('Should fail to start due to lacking an ORPort') - with open(torrc_path, 'w') as torrc_file: - torrc_file.write(BASIC_RELAY_TORRC % self.data_directory + '\nORPort 6954') + data_directory = tempfile.mkdtemp() + torrc_path = os.path.join(data_directory, 'torrc') + + try: + with open(torrc_path, 'w') as torrc_file: + torrc_file.write(BASIC_RELAY_TORRC % data_directory + '\nORPort 6954') + + output = run_tor(tor_cmd, '--list-fingerprint', '-f', torrc_path) + nickname, fingerprint_with_spaces = output.splitlines()[-1].split(' ', 1) + fingerprint = fingerprint_with_spaces.replace(' ', '') - output = run_tor(self.tor_cmd, '--list-fingerprint', '-f', torrc_path) - nickname, fingerprint_with_spaces = output.splitlines()[-1].split(' ', 1) - fingerprint = fingerprint_with_spaces.replace(' ', '') + if 'stemIntegTest' != nickname: + raise AssertionError("Nickname should be 'stemIntegTest': %s" % nickname) + elif 49 != len(fingerprint_with_spaces): + raise AssertionError('There should be 49 components in our fingerprint: %i' % len(fingerprint_with_spaces)) + elif not stem.util.tor_tools.is_valid_fingerprint(fingerprint): + raise AssertionError('We should have a valid fingerprint: %s' % fingerprint) - self.assertEqual('stemIntegTest', nickname) - self.assertEqual(49, len(fingerprint_with_spaces)) - self.assertTrue(stem.util.tor_tools.is_valid_fingerprint(fingerprint)) + with open(os.path.join(data_directory, 'fingerprint')) as fingerprint_file: + expected = 'stemIntegTest %s\n' % fingerprint + fingerprint_file_content = fingerprint_file.read() - with open(os.path.join(self.data_directory, 'fingerprint')) as fingerprint_file: - expected = 'stemIntegTest %s\n' % fingerprint - self.assertEqual(expected, fingerprint_file.read()) + if expected != fingerprint_file_content: + raise AssertionError('Unexpected fingerprint file: %s' % fingerprint_file_content) + finally: + shutil.rmtree(data_directory) @asynchronous def test_list_torrc_options_argument(tor_cmd): @@ -276,7 +290,7 @@ class TestProcess(unittest.TestCase): with patch('subprocess.Popen', Mock(return_value = mock_tor_process)): try: - stem.process.launch_tor(tor_cmd = test.runner.get_runner().get_tor_command()) + stem.process.launch_tor() self.fail("tor shoudn't have started") except KeyboardInterrupt as exc: if os.path.exists('/proc/%s' % mock_tor_process.pid):

1 0

[stem/master] Assertion helpers for async tests
by atagar＠torproject.org 08 Jun '17

08 Jun '17

commit 5b18cd5958ab248c4376d0df4e68bba8fe651229 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 8 10:00:41 2017 -0700 Assertion helpers for async tests Asynchronously run tests don't have access to the TestCase self reference which provides assertion methods. As such providing functions that do the same thing. --- stem/util/test_tools.py | 48 ++++++++++++++++++++++ test/integ/process.py | 103 ++++++++++++++++-------------------------------- 2 files changed, 81 insertions(+), 70 deletions(-) diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index 9f4fff4..6aecbd8 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -65,6 +65,54 @@ else: SkipTest = unittest.case.SkipTest +def assert_equal(expected, actual, msg = None): + """ + Function form of a TestCase's assertEqual. + + .. versionadded:: 1.6.0 + + :param object expected: expected value + :param object actual: actual value + :param str msg: message if assertion fails + + :raises: **AssertionError** if values aren't equal + """ + + if expected != actual: + raise AssertionError("Expected '%s' but was '%s'" % (expected, actual) if msg is None else msg) + + +def assert_in(expected, actual, msg = None): + """ + Asserts that a given value is within this content. + + .. versionadded:: 1.6.0 + + :param object expected: expected value + :param object actual: actual value + :param str msg: message if assertion fails + + :raises: **AssertionError** if the expected value isn't in the actual + """ + + if expected not in actual: + raise AssertionError("Expected '%s' to be within '%s'" % (expected, actual) if msg is None else msg) + + +def skip(msg): + """ + Function form of a TestCase's skipTest. + + .. versionadded:: 1.6.0 + + :param str msg: reason test is being skipped + + :raises: **unittest.case.SkipTest** for this reason + """ + + raise SkipTest(msg) + + def asynchronous(func): test = stem.util.test_tools.AsyncTest(func) ASYNC_TESTS['%s.%s' % (func.__module__, func.__name__)] = test diff --git a/test/integ/process.py b/test/integ/process.py index 9c23077..9ee96ad 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -26,7 +26,7 @@ import test import test.require from contextlib import contextmanager -from stem.util.test_tools import asynchronous +from stem.util.test_tools import asynchronous, assert_equal, assert_in, skip try: # added in python 3.3 @@ -114,10 +114,7 @@ class TestProcess(unittest.TestCase): Check that 'tor --version' matches 'GETINFO version'. """ - version_output = run_tor(tor_cmd, '--version') - - if 'Tor version %s.\n' % test.tor_version() != version_output: - raise AssertionError('Unexpected response: %s' % version_output) + assert_equal('Tor version %s.\n' % test.tor_version(), run_tor(tor_cmd, '--version')) @asynchronous def test_help_argument(tor_cmd): @@ -130,8 +127,7 @@ class TestProcess(unittest.TestCase): if not help_output.startswith('Copyright (c) 2001') or not help_output.endswith('tor -f <torrc> [args]\nSee man page for options, or https://www.torproject.org/ for documentation.\n'): raise AssertionError("Help output didn't have the expected strings: %s" % help_output) - if help_output != run_tor(tor_cmd, '-h'): - raise AssertionError("'tor -h' should simply be an alias for 'tor --help'") + assert_equal(help_output, run_tor(tor_cmd, '-h'), "'tor -h' should simply be an alias for 'tor --help'") @asynchronous def test_quiet_argument(tor_cmd): @@ -139,8 +135,8 @@ class TestProcess(unittest.TestCase): Check that we don't provide anything on stdout when running 'tor --quiet'. """ - if '' != run_tor(tor_cmd, '--quiet', '--invalid_argument', 'true', expect_failure = True): - raise AssertionError('No output should be provided with the --quiet argument') + quiet_output = run_tor(tor_cmd, '--quiet', '--invalid_argument', 'true', expect_failure = True) + assert_equal('', quiet_output, 'No output should be provided with the --quiet argument') @asynchronous def test_hush_argument(tor_cmd): @@ -149,14 +145,10 @@ class TestProcess(unittest.TestCase): """ output = run_tor(tor_cmd, '--hush', '--invalid_argument', expect_failure = True) - - if "[warn] Command-line option '--invalid_argument' with no value. Failing." not in output: - raise AssertionError('Unexpected response: %s' % output) + assert_in("[warn] Command-line option '--invalid_argument' with no value. Failing.", output) output = run_tor(tor_cmd, '--hush', '--invalid_argument', 'true', expect_failure = True) - - if "[warn] Failed to parse/validate config: Unknown option 'invalid_argument'. Failing." not in output: - raise AssertionError('Unexpected response: %s' % output) + assert_in("[warn] Failed to parse/validate config: Unknown option 'invalid_argument'. Failing.", output) @asynchronous def test_hash_password(tor_cmd): @@ -185,9 +177,7 @@ class TestProcess(unittest.TestCase): stuff = salt + b'my_password' repetitions = count // len(stuff) + 1 inp = (stuff * repetitions)[:count] - - if hashlib.sha1(inp).digest() != hashed: - raise AssertionError('Password hash not what we expected (%s rather than %s)' % (hashlib.sha1(inp).digest(), hashed)) + assert_equal(hashlib.sha1(inp).digest(), hashed) @asynchronous def test_hash_password_requires_argument(tor_cmd): @@ -197,9 +187,7 @@ class TestProcess(unittest.TestCase): """ output = run_tor(tor_cmd, '--hash-password', expect_failure = True) - - if "[warn] Command-line option '--hash-password' with no value. Failing." not in output: - raise AssertionError("'tor --hash-password' should require an argument") + assert_in("[warn] Command-line option '--hash-password' with no value. Failing.", output) @asynchronous def test_dump_config_argument(tor_cmd): @@ -212,14 +200,9 @@ class TestProcess(unittest.TestCase): full_output = run_tor(tor_cmd, '--dump-config', 'full', with_torrc = True) run_tor(tor_cmd, '--dump-config', 'invalid_option', with_torrc = True, expect_failure = True) - if 'Nickname stemIntegTest' not in short_output: - raise AssertionError("Dumping short config options didn't include our nickname: %s" % short_output) - - if 'Nickname stemIntegTest' not in non_builtin_output: - raise AssertionError("Dumping non-builtin config options didn't include our nickname: %s" % non_builtin_output) - - if 'Nickname stemIntegTest' not in full_output: - raise AssertionError("Dumping full config options didn't include our nickname: %s" % full_output) + assert_in('Nickname stemIntegTest', short_output) + assert_in('Nickname stemIntegTest', non_builtin_output) + assert_in('Nickname stemIntegTest', full_output) @asynchronous def test_validate_config_argument(tor_cmd): @@ -228,10 +211,7 @@ class TestProcess(unittest.TestCase): """ valid_output = run_tor(tor_cmd, '--verify-config', with_torrc = True) - - if 'Configuration was valid\n' not in valid_output: - raise AssertionError('Expected configuration to be valid') - + assert_in('Configuration was valid\n', valid_output, 'Expected configuration to be valid') run_tor(tor_cmd, '--verify-config', '-f', __file__, expect_failure = True) @asynchronous @@ -243,9 +223,7 @@ class TestProcess(unittest.TestCase): # This command should only work with a relay (which our test instance isn't). output = run_tor(tor_cmd, '--list-fingerprint', with_torrc = True, expect_failure = True) - - if "Clients don't have long-term identity keys. Exiting." not in output: - raise AssertionError('Should fail to start due to lacking an ORPort') + assert_in("Clients don't have long-term identity keys. Exiting.", output, 'Should fail to start due to lacking an ORPort') with tmp_directory() as data_directory: torrc_path = os.path.join(data_directory, 'torrc') @@ -257,19 +235,15 @@ class TestProcess(unittest.TestCase): nickname, fingerprint_with_spaces = output.splitlines()[-1].split(' ', 1) fingerprint = fingerprint_with_spaces.replace(' ', '') - if 'stemIntegTest' != nickname: - raise AssertionError("Nickname should be 'stemIntegTest': %s" % nickname) - elif 49 != len(fingerprint_with_spaces): - raise AssertionError('There should be 49 components in our fingerprint: %i' % len(fingerprint_with_spaces)) - elif not stem.util.tor_tools.is_valid_fingerprint(fingerprint): + assert_equal('stemIntegTest', nickname) + assert_equal(49, len(fingerprint_with_spaces)) + + if not stem.util.tor_tools.is_valid_fingerprint(fingerprint): raise AssertionError('We should have a valid fingerprint: %s' % fingerprint) with open(os.path.join(data_directory, 'fingerprint')) as fingerprint_file: expected = 'stemIntegTest %s\n' % fingerprint - fingerprint_file_content = fingerprint_file.read() - - if expected != fingerprint_file_content: - raise AssertionError('Unexpected fingerprint file: %s' % fingerprint_file_content) + assert_equal(expected, fingerprint_file.read()) @asynchronous def test_list_torrc_options_argument(tor_cmd): @@ -333,8 +307,7 @@ class TestProcess(unittest.TestCase): 'SocksPort 9090', ] - if expected != result: - raise AssertionError("Unexpected output from 'tor -f torrc --dump-config short': %s" % result) + assert_equal(expected, result) @asynchronous def test_torrc_arguments_via_stdin(tor_cmd): @@ -343,14 +316,12 @@ class TestProcess(unittest.TestCase): """ if test.tor_version() < stem.version.Requirement.TORRC_VIA_STDIN: - raise stem.util.test_tools.SkipTest('(requires )' % stem.version.Requirement.TORRC_VIA_STDIN) + skip('(requires )' % stem.version.Requirement.TORRC_VIA_STDIN) with tmp_directory() as data_directory: torrc = BASIC_RELAY_TORRC % data_directory output = run_tor(tor_cmd, '-f', '-', '--dump-config', 'short', stdin = torrc) - - if sorted(torrc.splitlines()) != sorted(output.splitlines()): - raise AssertionError("Unexpected output from 'tor -f - --dump-config short': %s" % output) + assert_equal(sorted(torrc.splitlines()), sorted(output.splitlines())) @asynchronous def test_with_missing_torrc(tor_cmd): @@ -359,14 +330,10 @@ class TestProcess(unittest.TestCase): """ output = run_tor(tor_cmd, '-f', '/path/that/really/shouldnt/exist', '--verify-config', expect_failure = True) - - if '[warn] Unable to open configuration file "/path/that/really/shouldnt/exist".' not in output: - raise AssertionError('Tor refuse to read a non-existant torrc file') + assert_in('[warn] Unable to open configuration file "/path/that/really/shouldnt/exist".', output, 'Tor should refuse to read a non-existant torrc file') output = run_tor(tor_cmd, '-f', '/path/that/really/shouldnt/exist', '--verify-config', '--ignore-missing-torrc') - - if '[notice] Configuration file "/path/that/really/shouldnt/exist" not present, using reasonable defaults.' not in output: - raise AssertionError('Missing torrc should be allowed with --ignore-missing-torrc') + assert_in('[notice] Configuration file "/path/that/really/shouldnt/exist" not present, using reasonable defaults.', output, 'Missing torrc should be allowed with --ignore-missing-torrc') @asynchronous def test_can_run_multithreaded(tor_cmd): @@ -411,9 +378,8 @@ class TestProcess(unittest.TestCase): return raised_exc[0] exc = launch_async_with_timeout(0.5) - - if type(exc) != OSError or str(exc) != 'Launching tor with a timeout can only be done in the main thread': - raise AssertionError("Exception isn't what we expected: %s" % exc) + assert_equal(OSError, type(exc)) + assert_equal('Launching tor with a timeout can only be done in the main thread', str(exc)) # We should launch successfully if no timeout is specified or we specify it # to be 'None'. @@ -456,8 +422,7 @@ class TestProcess(unittest.TestCase): control_socket.send('GETCONF ControlPort') getconf_response = control_socket.recv() - if 'ControlPort=%s' % control_port != str(getconf_response): - raise AssertionError('Expected tor to report its ControlPort as %s but was: %s' % (control_port, getconf_response)) + assert_equal('ControlPort=%s' % control_port, str(getconf_response)) finally: if control_socket: control_socket.close() @@ -473,7 +438,7 @@ class TestProcess(unittest.TestCase): """ if test.tor_version() < stem.version.Requirement.TORRC_VIA_STDIN: - raise stem.util.test_tools.SkipTest('(requires )' % stem.version.Requirement.TORRC_VIA_STDIN) + skip('(requires )' % stem.version.Requirement.TORRC_VIA_STDIN) with tmp_directory() as data_directory: control_port = random_port() @@ -497,8 +462,7 @@ class TestProcess(unittest.TestCase): control_socket.send('GETCONF ControlPort') getconf_response = control_socket.recv() - if 'ControlPort=%s' % control_port != str(getconf_response): - raise AssertionError('Expected tor to report its ControlPort as %s but was: %s' % (control_port, getconf_response)) + assert_equal('ControlPort=%s' % control_port, str(getconf_response)) finally: if control_socket: control_socket.close() @@ -533,8 +497,7 @@ class TestProcess(unittest.TestCase): raise AssertionError('Tor should fail to launch') except OSError as exc: - if str(exc) != 'Process terminated: Failed to bind one of the listener ports.': - raise AssertionError('Unexpected error response from tor: %s' % exc) + assert_equal('Process terminated: Failed to bind one of the listener ports.', str(exc)) @asynchronous def test_launch_tor_with_timeout(tor_cmd): @@ -570,9 +533,9 @@ class TestProcess(unittest.TestCase): """ if not stem.util.system.is_available('sleep'): - raise stem.util.test_tools.SkipTest('(sleep unavailable)') + skip('(sleep unavailable)') elif test.tor_version() < stem.version.Requirement.TAKEOWNERSHIP: - raise stem.util.test_tools.SkipTest('(requires )' % stem.version.Requirement.TAKEOWNERSHIP) + skip('(requires )' % stem.version.Requirement.TAKEOWNERSHIP) with tmp_directory() as data_directory: sleep_process = subprocess.Popen(['sleep', '60']) @@ -616,7 +579,7 @@ class TestProcess(unittest.TestCase): """ if test.tor_version() < stem.version.Requirement.TAKEOWNERSHIP: - raise stem.util.test_tools.SkipTest('(requires )' % stem.version.Requirement.TAKEOWNERSHIP) + skip('(requires )' % stem.version.Requirement.TAKEOWNERSHIP) with tmp_directory() as data_directory: control_port = random_port()

1 0

[stem/master] Context manager for making a torrc
by atagar＠torproject.org 08 Jun '17

08 Jun '17

commit 65226e53a66156c16c87e4e4ec19a265bda74755 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 7 10:01:02 2017 -0700 Context manager for making a torrc Few spots would benefit with a context manager that makes a torrc too. --- test/integ/process.py | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/test/integ/process.py b/test/integ/process.py index a047540..9c23077 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -58,6 +58,17 @@ def tmp_directory(): shutil.rmtree(tmp_dir) +@contextmanager +def torrc(): + with tmp_directory() as data_directory: + torrc_path = os.path.join(data_directory, 'torrc') + + with open(torrc_path, 'w') as torrc_file: + torrc_file.write(BASIC_RELAY_TORRC % data_directory) + + yield torrc_path + + def run_tor(tor_cmd, *args, **kwargs): # python doesn't allow us to have individual keyword arguments when there's # an arbitrary number of positional arguments, so explicitly checking @@ -69,13 +80,8 @@ def run_tor(tor_cmd, *args, **kwargs): if kwargs: raise ValueError('Got unexpected keyword arguments: %s' % kwargs) - with tmp_directory() as data_directory: + with torrc() as torrc_path: if with_torrc: - torrc_path = os.path.join(data_directory, 'torrc') - - with open(torrc_path, 'w') as torrc_file: - torrc_file.write(BASIC_RELAY_TORRC % data_directory) - args = ['-f', torrc_path] + list(args) args = [tor_cmd] + list(args) @@ -307,12 +313,7 @@ class TestProcess(unittest.TestCase): Pass configuration options on the commandline. """ - with tmp_directory() as data_directory: - torrc_path = os.path.join(data_directory, 'torrc') - - with open(torrc_path, 'w') as torrc_file: - torrc_file.write(BASIC_RELAY_TORRC % data_directory) - + with torrc() as torrc_path: config_args = [ '+SocksPort', '9090', # append an extra SocksPort '/ExtORPort', # drops our ExtORPort @@ -388,7 +389,15 @@ class TestProcess(unittest.TestCase): def short_launch(): try: - stem.process.launch_tor_with_config({'SocksPort': 'invalid', 'DataDirectory': data_directory}, tor_cmd, 100, None, timeout_arg) + stem.process.launch_tor_with_config( + tor_cmd = tor_cmd, + config = { + 'SocksPort': 'invalid', + 'DataDirectory': data_directory, + }, + completion_percent = 100, + timeout = timeout_arg, + ) except Exception as exc: raised_exc[0] = exc

1 0

[stem/master] Reduce priority of background tests
by atagar＠torproject.org 08 Jun '17

08 Jun '17

commit b7dc0a8f02f5cb366aa80438678b4245d001481f Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 6 10:14:36 2017 -0700 Reduce priority of background tests Dropping the niceness priority of our background tests so they don't compete with our main testing thread so much. Not a lot, but drops the runtime for me from 27.5s to 26.4s (4% faster). --- stem/util/test_tools.py | 2 ++ test/task.py | 1 + 2 files changed, 3 insertions(+) diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index 43befd4..9f4fff4 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -110,6 +110,8 @@ class AsyncTest(object): def run(self, *runner_args, **kwargs): def _wrapper(conn, runner, args): + os.nice(12) + try: runner(*args) if args else runner() conn.send(AsyncResult('success', None)) diff --git a/test/task.py b/test/task.py index 63a9f20..c647736 100644 --- a/test/task.py +++ b/test/task.py @@ -170,6 +170,7 @@ class Task(object): try: if self._is_background_task: def _run_wrapper(conn, runner, args): + os.nice(15) conn.send(runner(*args) if args else runner()) conn.close()

1 0

[webwml/master] update tor versions on website: 0.3.0.8, 0.3.1.3-alpha
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit 5e6d748a3184d335c879ea924ae7e0edf8e7b327 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 11:10:40 2017 -0400 update tor versions on website: 0.3.0.8, 0.3.1.3-alpha --- Makefile | 4 ++-- include/versions.wmi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 921beef..4758dd7 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ # branch to your personal webwml repository, open a trac ticket in the # website component, and set it to needs_review. -export STABLETAG=tor-0.3.0.7 -export DEVTAG=tor-0.3.1.2-alpha +export STABLETAG=tor-0.3.0.8 +export DEVTAG=tor-0.3.1.3-alpha WMLBASE=. diff --git a/include/versions.wmi b/include/versions.wmi index 4fadd81..f56c0e6 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,5 +1,5 @@ -<define-tag version-stable whitespace=delete>0.3.0.7</define-tag> -<define-tag version-alpha whitespace=delete>0.3.1.2-alpha</define-tag> +<define-tag version-stable whitespace=delete>0.3.0.8</define-tag> +<define-tag version-alpha whitespace=delete>0.3.1.3-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.3.0.7</define-tag>

1 0

[tor/release-0.2.8] Bump to 0.2.7.8
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit 2efe0275bcdbbdf37d1d8ef59a8ec4df9f5fca59 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 09:27:34 2017 -0400 Bump to 0.2.7.8 --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 80c4d3c..f754942 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.7.7]) +AC_INIT([tor],[0.2.7.8]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index f20c1a6..32c9731 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.7.7" +!define VERSION "0.2.7.8" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 57385c9..46714ef 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.7.7" +#define VERSION "0.2.7.8"

1 0

[tor/release-0.2.8] Bump to 0.2.6.12
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit 0de46203750f8c01b5f355d743949fe8471b0636 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 09:26:20 2017 -0400 Bump to 0.2.6.12 --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index a79ea82..55e59e9 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.6.11]) +AC_INIT([tor],[0.2.6.12]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 6611bb8..4de6b1b 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.6.11" +!define VERSION "0.2.6.12" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 59cd43e..74a27f4 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.6.11" +#define VERSION "0.2.6.12"

1 0

[tor/release-0.2.8] bump to 0.2.5.14
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit fa73f59ad3902449826f31635e47aa4750b23209 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 09:26:00 2017 -0400 bump to 0.2.5.14 --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 8f85dae..da797e5 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.5.13]) +AC_INIT([tor],[0.2.5.14]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 9661e10..3e55030 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.5.13" +!define VERSION "0.2.5.14" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index aa04092..d45f51e 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.5.13" +#define VERSION "0.2.5.14"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2017