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

[stem/master] Report to the user new capabilities found in Tor
by atagar＠torproject.org 23 Mar '15

23 Mar '15

commit f363591d9658f63385a0d32c7d30eecfa659a50b Author: Cristóbal <cristobal.leiva(a)usach.cl> Date: Thu Mar 12 00:28:50 2015 -0300 Report to the user new capabilities found in Tor --- run_tests.py | 18 +++++++++++------- test/integ/descriptor/server_descriptor.py | 16 ++++++---------- test/util.py | 18 ++++++++++++++---- 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/run_tests.py b/run_tests.py index 70e0648..2a44366 100755 --- a/run_tests.py +++ b/run_tests.py @@ -58,6 +58,15 @@ version 0.8.0 or later... https://pypi.python.org/pypi/mock/ """ +NEW_CAPABILITIES_FOUND = """\ +Your version of Tor has capabilities stem presently isn't taking advantage of. +If you're running the latest version of stem then please file a ticket on: + +https://trac.torproject.org/projects/tor/wiki/doc/stem/bugs + +New capabilities are: +""" + PYFLAKES_TASK = Task( 'running pyflakes', stem.util.test_tools.pyflakes_issues, @@ -288,19 +297,14 @@ def main(): println('TESTING PASSED %s\n' % runtime_label, SUCCESS) - new_capabilities = test.util.check_new_capabilities() + new_capabilities = test.util.get_new_capabilities() if new_capabilities: - println() - - println('Your version of tor has capabilities stem presently isn\'t taking advantage of. If you\'re running the latest version of stem then please file a ticket on...\n', ERROR) - println('https://trac.torproject.org/projects/tor/wiki/doc/stem/bugs', ERROR) - println('\nNew capabilities are...\n', ERROR) + println(NEW_CAPABILITIES_FOUND, ERROR) for item in new_capabilities: println('%s: %s' % (new_capabilities[item], item), ERROR) - println() sys.exit(1 if error_tracker.has_errors_occured() else 0) diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index 74f8afd..e7d49fd 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -39,15 +39,11 @@ class TestServerDescriptor(unittest.TestCase): unrecognized_lines = desc.get_unrecognized_lines() - if unrecognized_lines: - # TODO: This isn't actually a problem, and rather than failing we - # should alert the user about these entries at the end of the tests - # (along with new events, getinfo options, and such). For now though - # there doesn't seem to be anything in practice to trigger this so - # failing to get our attention if it does. - + if unrecognized_lines: + # Forward-compability: + # 1) SHOULD function at least as it does normally (ignore the unknown) + # 2) Report each of the aditional (unrecognized) fields to the user + for line in unrecognized_lines: key = line.split()[0] - test.util.NEW_CAPABILITIES[key] = 'Extrainfo Descriptor Entry' - - #self.fail('Unrecognized descriptor content: %s' % unrecognized_lines) + test.util.register_new_capability(key, 'Server Descriptor Entry') diff --git a/test/util.py b/test/util.py index a6c6515..10fd408 100644 --- a/test/util.py +++ b/test/util.py @@ -80,7 +80,7 @@ Target = stem.util.enum.UppercaseEnum( STEM_BASE = os.path.sep.join(__file__.split(os.path.sep)[:-2]) -# register new capabilities found +# Store new capabilities (events, descriptor entries, etc.) NEW_CAPABILITIES = {} @@ -179,6 +179,13 @@ def get_torrc_entries(target): return torrc_opts +def get_new_capabilities(): + """ + Return list of new capabilities found during the tests + """ + return NEW_CAPABILITIES + + def check_stem_version(): return stem.__version__ @@ -269,11 +276,14 @@ def check_for_unused_tests(paths): raise ValueError('Test modules are missing from our test/settings.cfg:\n%s' % '\n'.join(unused_tests)) -def check_new_capabilities(): +def register_new_capability(key, label): """ - Return list of new capabilities found during tests + Register new capability found during the tests. + + :param str key: unique string to identify this new capability + :param str label: string describing where we found this new capability """ - return NEW_CAPABILITIES + NEW_CAPABILITIES[key] = label def _is_test_data(path):

1 0

[stem/master] Initial approach to keep track of new Tor capabilities
by atagar＠torproject.org 23 Mar '15

23 Mar '15

commit c5acd3043a4a467039ff3377cf9a472b2d24addb Author: Cristóbal <cristobal.leiva(a)usach.cl> Date: Sat Mar 7 16:12:57 2015 -0300 Initial approach to keep track of new Tor capabilities --- run_tests.py | 14 ++++++++++++++ test/integ/descriptor/server_descriptor.py | 8 +++++++- test/util.py | 11 +++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/run_tests.py b/run_tests.py index e447866..70e0648 100755 --- a/run_tests.py +++ b/run_tests.py @@ -287,6 +287,20 @@ def main(): println('%i TESTS WERE SKIPPED' % skipped_tests, STATUS) println('TESTING PASSED %s\n' % runtime_label, SUCCESS) + + new_capabilities = test.util.check_new_capabilities() + + if new_capabilities: + println() + + println('Your version of tor has capabilities stem presently isn\'t taking advantage of. If you\'re running the latest version of stem then please file a ticket on...\n', ERROR) + println('https://trac.torproject.org/projects/tor/wiki/doc/stem/bugs', ERROR) + println('\nNew capabilities are...\n', ERROR) + + for item in new_capabilities: + println('%s: %s' % (new_capabilities[item], item), ERROR) + + println() sys.exit(1 if error_tracker.has_errors_occured() else 0) diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index 6d5d348..74f8afd 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -11,6 +11,8 @@ import test.runner from test.runner import only_run_once +import test.util + class TestServerDescriptor(unittest.TestCase): @only_run_once @@ -43,5 +45,9 @@ class TestServerDescriptor(unittest.TestCase): # (along with new events, getinfo options, and such). For now though # there doesn't seem to be anything in practice to trigger this so # failing to get our attention if it does. + + for line in unrecognized_lines: + key = line.split()[0] + test.util.NEW_CAPABILITIES[key] = 'Extrainfo Descriptor Entry' - self.fail('Unrecognized descriptor content: %s' % unrecognized_lines) + #self.fail('Unrecognized descriptor content: %s' % unrecognized_lines) diff --git a/test/util.py b/test/util.py index 5614e4f..a6c6515 100644 --- a/test/util.py +++ b/test/util.py @@ -80,6 +80,10 @@ Target = stem.util.enum.UppercaseEnum( STEM_BASE = os.path.sep.join(__file__.split(os.path.sep)[:-2]) +# register new capabilities found + +NEW_CAPABILITIES = {} + def get_unit_tests(module_prefix = None): """ @@ -263,6 +267,13 @@ def check_for_unused_tests(paths): if unused_tests: raise ValueError('Test modules are missing from our test/settings.cfg:\n%s' % '\n'.join(unused_tests)) + + +def check_new_capabilities(): + """ + Return list of new capabilities found during tests + """ + return NEW_CAPABILITIES def _is_test_data(path):

1 0

[stem/master] Provide '[type] description' for new capabilities
by atagar＠torproject.org 23 Mar '15

23 Mar '15

commit 4d5291895595c2ffbb59032f1865db6aa0f18851 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 22 17:17:35 2015 -0700 Provide '[type] description' for new capabilities For descriptors we just provided the keyword rather than the whole line. Might as well show something like... [Server descriptor line] new-keyword 25,38,290 --- run_tests.py | 12 ++++---- test/integ/control/controller.py | 13 ++------ test/integ/descriptor/extrainfo_descriptor.py | 12 ++------ test/integ/descriptor/microdescriptor.py | 13 ++------ test/integ/descriptor/networkstatus.py | 41 ++++++++----------------- test/integ/descriptor/server_descriptor.py | 13 ++------ test/util.py | 21 ++++++++----- 7 files changed, 41 insertions(+), 84 deletions(-) diff --git a/run_tests.py b/run_tests.py index 2a44366..4e8a8fd 100755 --- a/run_tests.py +++ b/run_tests.py @@ -62,9 +62,10 @@ NEW_CAPABILITIES_FOUND = """\ Your version of Tor has capabilities stem presently isn't taking advantage of. If you're running the latest version of stem then please file a ticket on: -https://trac.torproject.org/projects/tor/wiki/doc/stem/bugs + https://trac.torproject.org/projects/tor/wiki/doc/stem/bugs New capabilities are: + """ PYFLAKES_TASK = Task( @@ -296,15 +297,14 @@ def main(): println('%i TESTS WERE SKIPPED' % skipped_tests, STATUS) println('TESTING PASSED %s\n' % runtime_label, SUCCESS) - + new_capabilities = test.util.get_new_capabilities() - + if new_capabilities: println(NEW_CAPABILITIES_FOUND, ERROR) - - for item in new_capabilities: - println('%s: %s' % (new_capabilities[item], item), ERROR) + for capability_type, msg in new_capabilities: + println(' [%s] %s' % (capability_type, msg), ERROR) sys.exit(1 if error_tracker.has_errors_occured() else 0) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 2be5a17..fb08e0f 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -26,6 +26,7 @@ from stem import Flag, Signal from stem.control import EventType, Listener, State from stem.exit_policy import ExitPolicy from stem.version import Requirement + from test.util import register_new_capability from test.runner import ( @@ -1085,16 +1086,8 @@ class TestController(unittest.TestCase): self.assertTrue(desc.fingerprint is not None) self.assertTrue(desc.nickname is not None) - unrecognized_lines = desc.get_unrecognized_lines() - - if unrecognized_lines: - # Forward-compability: - # 1) SHOULD function at least as it does normally (ignore the unknown) - # 2) Report each of the aditional (unrecognized) fields to the user - - for line in unrecognized_lines: - key = line.split()[0] - register_new_capability(key, 'Network Descriptor Entry') + for line in desc.get_unrecognized_lines(): + register_new_capability('Consensus line', line) count += 1 if count > 10: diff --git a/test/integ/descriptor/extrainfo_descriptor.py b/test/integ/descriptor/extrainfo_descriptor.py index 92dcbf5..0c37afa 100644 --- a/test/integ/descriptor/extrainfo_descriptor.py +++ b/test/integ/descriptor/extrainfo_descriptor.py @@ -9,7 +9,6 @@ import stem.descriptor import test.runner from test.runner import only_run_once - from test.util import register_new_capability @@ -30,7 +29,8 @@ class TestExtraInfoDescriptor(unittest.TestCase): with open(descriptor_path, 'rb') as descriptor_file: for desc in stem.descriptor.parse_file(descriptor_file, 'extra-info 1.0', validate = True): - unrecognized_lines = desc.get_unrecognized_lines() + for line in desc.get_unrecognized_lines(): + register_new_capability('Extra-info descriptor line', line) if desc.dir_v2_responses_unknown: self.fail('Unrecognized statuses on dirreq-v2-resp lines: %s' % desc.dir_v2_responses_unknown) @@ -42,11 +42,3 @@ class TestExtraInfoDescriptor(unittest.TestCase): self.fail('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) - elif unrecognized_lines: - # Forward-compability: - # 1) SHOULD function at least as it does normally (ignore the unknown) - # 2) Report each of the aditional (unrecognized) fields to the user - - for line in unrecognized_lines: - key = line.split()[0] - register_new_capability(key, 'Extrainfo Descriptor Entry') diff --git a/test/integ/descriptor/microdescriptor.py b/test/integ/descriptor/microdescriptor.py index 0ea7ea1..26d04ef 100644 --- a/test/integ/descriptor/microdescriptor.py +++ b/test/integ/descriptor/microdescriptor.py @@ -9,7 +9,6 @@ import stem.descriptor import test.runner from test.runner import only_run_once - from test.util import register_new_capability @@ -30,13 +29,5 @@ class TestMicrodescriptor(unittest.TestCase): with open(descriptor_path, 'rb') as descriptor_file: for desc in stem.descriptor.parse_file(descriptor_file, 'microdescriptor 1.0', validate = True): - unrecognized_lines = desc.get_unrecognized_lines() - - if unrecognized_lines: - # Forward-compability: - # 1) SHOULD function at least as it does normally (ignore the unknown) - # 2) Report each of the aditional (unrecognized) fields to the user - - for line in unrecognized_lines: - key = line.split()[0] - register_new_capability(key, 'Microdescriptor Descriptor Entry') + for line in desc.get_unrecognized_lines(): + register_new_capability('Microdescriptor line', line) diff --git a/test/integ/descriptor/networkstatus.py b/test/integ/descriptor/networkstatus.py index 21fdaf1..215188a 100644 --- a/test/integ/descriptor/networkstatus.py +++ b/test/integ/descriptor/networkstatus.py @@ -12,7 +12,6 @@ import stem.version import test.runner from test.runner import only_run_once - from test.util import register_new_capability @@ -35,26 +34,19 @@ class TestNetworkStatus(unittest.TestCase): test.runner.skip(self, '(unavailable on windows)') return - count = 0 + count, reported_flags = 0, [] + with open(consensus_path, 'rb') as descriptor_file: for router in stem.descriptor.parse_file(descriptor_file, 'network-status-consensus-3 1.0', validate = True): count += 1 - # check if there's any unknown flags and report them to the user for flag in router.flags: - if flag not in stem.Flag: - register_new_capability(flag, 'Network Flag') - - unrecognized_lines = router.get_unrecognized_lines() + if flag not in stem.Flag and flag not in reported_flags: + register_new_capability('Relay flag', flag) + reported_flags.append(flag) - if unrecognized_lines: - # Forward-compability: - # 1) SHOULD function at least as it does normally (ignore the unknown) - # 2) Report each of the aditional (unrecognized) fields to the user - - for line in unrecognized_lines: - key = line.split()[0] - register_new_capability(key, 'Network Descriptor Entry') + for line in router.get_unrecognized_lines(): + register_new_capability('Consensus line', line) # 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. @@ -76,25 +68,18 @@ class TestNetworkStatus(unittest.TestCase): test.runner.skip(self, '(unavailable on windows)') return - count = 0 + count, reported_flags = 0, [] + with open(consensus_path, 'rb') as descriptor_file: for router in stem.descriptor.parse_file(descriptor_file, 'network-status-microdesc-consensus-3 1.0', validate = True): count += 1 - # check if there's any unknown flags and report them to the user for flag in router.flags: if flag not in stem.Flag: - register_new_capability(flag, 'Network Flag') - - unrecognized_lines = router.get_unrecognized_lines() - - if unrecognized_lines: - # Forward-compability: - # 1) SHOULD function at least as it does normally (ignore the unknown) - # 2) Report each of the aditional (unrecognized) fields to the user + register_new_capability('Relay flag (microdescriptor consensus)', flag) + reported_flags.append(flag) - for line in unrecognized_lines: - key = line.split()[0] - register_new_capability(key, 'Network Descriptor Entry') + for line in router.get_unrecognized_lines(): + register_new_capability('Microdescriptor consensus line', line) self.assertTrue(count > 100) diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index 1404cfa..7afff60 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -10,7 +10,6 @@ import stem.descriptor import test.runner from test.runner import only_run_once - from test.util import register_new_capability @@ -37,13 +36,5 @@ class TestServerDescriptor(unittest.TestCase): self.assertEqual(None, desc.eventdns) self.assertEqual(None, desc.socks_port) - unrecognized_lines = desc.get_unrecognized_lines() - - if unrecognized_lines: - # Forward-compability: - # 1) SHOULD function at least as it does normally (ignore the unknown) - # 2) Report each of the aditional (unrecognized) fields to the user - - for line in unrecognized_lines: - key = line.split()[0] - register_new_capability(key, 'Server Descriptor Entry') + for line in desc.get_unrecognized_lines(): + register_new_capability('Server descriptor line', line) diff --git a/test/util.py b/test/util.py index 10fd408..87fc47e 100644 --- a/test/util.py +++ b/test/util.py @@ -82,7 +82,7 @@ STEM_BASE = os.path.sep.join(__file__.split(os.path.sep)[:-2]) # Store new capabilities (events, descriptor entries, etc.) -NEW_CAPABILITIES = {} +NEW_CAPABILITIES = [] def get_unit_tests(module_prefix = None): @@ -181,8 +181,12 @@ def get_torrc_entries(target): def get_new_capabilities(): """ - Return list of new capabilities found during the tests + Provides a list of capabilities tor supports but stem doesn't, as discovered + while running our tests. + + :returns: **list** of (type, message) tuples for the capabilities """ + return NEW_CAPABILITIES @@ -274,16 +278,17 @@ def check_for_unused_tests(paths): if unused_tests: raise ValueError('Test modules are missing from our test/settings.cfg:\n%s' % '\n'.join(unused_tests)) - -def register_new_capability(key, label): + +def register_new_capability(capability_type, msg): """ Register new capability found during the tests. - - :param str key: unique string to identify this new capability - :param str label: string describing where we found this new capability + + :param str capability_type: type of capability this is + :param str msg: description of what we found """ - NEW_CAPABILITIES[key] = label + + NEW_CAPABILITIES.append((capability_type, msg)) def _is_test_data(path):

1 0

[stem/master] Check for new event types, signals, or features
by atagar＠torproject.org 23 Mar '15

23 Mar '15

commit ddfeb6bd5892dc8e40e0c67bd5b4dd6751899c1e Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 22 17:36:35 2015 -0700 Check for new event types, signals, or features Taking advantage of our new register_new_capability() util to note when tor supports new events, signals, or features that we don't. Interesting. It's already telling us about stuff... Your version of Tor has capabilities stem presently isn't taking advantage of. If you're running the latest version of stem then please file a ticket on: https://trac.torproject.org/projects/tor/wiki/doc/stem/bugs New capabilities are: [Event] CONN_BW [Event] CELL_STATS [Event] TB_EMPTY [Event] CIRC_BW [Event] TRANSPORT_LAUNCHED --- run_tests.py | 1 - test/integ/control/controller.py | 26 ++++++++++++++++++++++++- test/integ/descriptor/extrainfo_descriptor.py | 2 +- test/integ/descriptor/microdescriptor.py | 2 +- test/integ/descriptor/networkstatus.py | 8 ++++---- test/integ/descriptor/server_descriptor.py | 2 +- 6 files changed, 32 insertions(+), 9 deletions(-) diff --git a/run_tests.py b/run_tests.py index 4e8a8fd..824b16c 100755 --- a/run_tests.py +++ b/run_tests.py @@ -65,7 +65,6 @@ If you're running the latest version of stem then please file a ticket on: https://trac.torproject.org/projects/tor/wiki/doc/stem/bugs New capabilities are: - """ PYFLAKES_TASK = Task( diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index fb08e0f..7ce3fdc 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -33,6 +33,7 @@ from test.runner import ( require_controller, require_version, require_online, + only_run_once, ) # Router status entry for a relay with a nickname other than 'Unnamed'. This is @@ -50,6 +51,29 @@ def random_fingerprint(): class TestController(unittest.TestCase): + @only_run_once + @require_controller + def test_missing_capabilities(self): + """ + Check to see if tor supports any events, signals, or features that we + don't. + """ + + with test.runner.get_runner().get_tor_controller() as controller: + for event in controller.get_info('events/names').split(): + if event not in EventType: + register_new_capability('Event', event) + + for signal in controller.get_info('signal/names').split(): + if signal not in Signal: + register_new_capability('Signal', signal) + + # new features should simply be added to enable_feature()'s docs + + for feature in controller.get_info('features/names').split(): + if feature not in ('EXTENDED_EVENTS', 'VERBOSE_NAMES'): + register_new_capability('Feature', feature) + def test_from_port(self): """ Basic sanity check for the from_port constructor. @@ -1087,7 +1111,7 @@ class TestController(unittest.TestCase): self.assertTrue(desc.nickname is not None) for line in desc.get_unrecognized_lines(): - register_new_capability('Consensus line', line) + register_new_capability('Consensus Line', line) count += 1 if count > 10: diff --git a/test/integ/descriptor/extrainfo_descriptor.py b/test/integ/descriptor/extrainfo_descriptor.py index 0c37afa..740ac59 100644 --- a/test/integ/descriptor/extrainfo_descriptor.py +++ b/test/integ/descriptor/extrainfo_descriptor.py @@ -30,7 +30,7 @@ class TestExtraInfoDescriptor(unittest.TestCase): with open(descriptor_path, 'rb') as descriptor_file: for desc in stem.descriptor.parse_file(descriptor_file, 'extra-info 1.0', validate = True): for line in desc.get_unrecognized_lines(): - register_new_capability('Extra-info descriptor line', line) + 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) diff --git a/test/integ/descriptor/microdescriptor.py b/test/integ/descriptor/microdescriptor.py index 26d04ef..fad7ef8 100644 --- a/test/integ/descriptor/microdescriptor.py +++ b/test/integ/descriptor/microdescriptor.py @@ -30,4 +30,4 @@ class TestMicrodescriptor(unittest.TestCase): with open(descriptor_path, 'rb') as descriptor_file: for desc in stem.descriptor.parse_file(descriptor_file, 'microdescriptor 1.0', validate = True): for line in desc.get_unrecognized_lines(): - register_new_capability('Microdescriptor line', line) + register_new_capability('Microdescriptor Line', line) diff --git a/test/integ/descriptor/networkstatus.py b/test/integ/descriptor/networkstatus.py index 215188a..e02f178 100644 --- a/test/integ/descriptor/networkstatus.py +++ b/test/integ/descriptor/networkstatus.py @@ -42,11 +42,11 @@ class TestNetworkStatus(unittest.TestCase): for flag in router.flags: if flag not in stem.Flag and flag not in reported_flags: - register_new_capability('Relay flag', flag) + register_new_capability('Flag', flag) reported_flags.append(flag) for line in router.get_unrecognized_lines(): - register_new_capability('Consensus line', line) + register_new_capability('Consensus Line', line) # 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. @@ -76,10 +76,10 @@ class TestNetworkStatus(unittest.TestCase): for flag in router.flags: if flag not in stem.Flag: - register_new_capability('Relay flag (microdescriptor consensus)', flag) + register_new_capability('Flag (microdescriptor)', flag) reported_flags.append(flag) for line in router.get_unrecognized_lines(): - register_new_capability('Microdescriptor consensus line', line) + register_new_capability('Microdescriptor Consensus Line', line) self.assertTrue(count > 100) diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index 7afff60..86e4942 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -37,4 +37,4 @@ class TestServerDescriptor(unittest.TestCase): self.assertEqual(None, desc.socks_port) for line in desc.get_unrecognized_lines(): - register_new_capability('Server descriptor line', line) + register_new_capability('Server Descriptor Line', line)

1 0

[stem/master] Register unrecognized lines as new Tor capabilities
by atagar＠torproject.org 23 Mar '15

23 Mar '15

commit 22d1c1bccaa99814d621c840bc13fe6470442589 Author: Cristóbal <cristobal.leiva(a)usach.cl> Date: Fri Mar 20 21:25:45 2015 -0300 Register unrecognized lines as new Tor capabilities --- test/integ/control/controller.py | 9 +++++++- test/integ/descriptor/extrainfo_descriptor.py | 14 +++++++----- test/integ/descriptor/microdescriptor.py | 10 ++++++++- test/integ/descriptor/networkstatus.py | 30 ++++++++++++++++--------- test/integ/descriptor/server_descriptor.py | 4 ++-- 5 files changed, 47 insertions(+), 20 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index ca18292..2be5a17 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -26,6 +26,7 @@ from stem import Flag, Signal from stem.control import EventType, Listener, State from stem.exit_policy import ExitPolicy from stem.version import Requirement +from test.util import register_new_capability from test.runner import ( require_controller, @@ -1087,7 +1088,13 @@ class TestController(unittest.TestCase): unrecognized_lines = desc.get_unrecognized_lines() if unrecognized_lines: - self.fail('Unrecognized descriptor content: %s' % unrecognized_lines) + # Forward-compability: + # 1) SHOULD function at least as it does normally (ignore the unknown) + # 2) Report each of the aditional (unrecognized) fields to the user + + for line in unrecognized_lines: + key = line.split()[0] + register_new_capability(key, 'Network Descriptor Entry') count += 1 if count > 10: diff --git a/test/integ/descriptor/extrainfo_descriptor.py b/test/integ/descriptor/extrainfo_descriptor.py index d102fea..92dcbf5 100644 --- a/test/integ/descriptor/extrainfo_descriptor.py +++ b/test/integ/descriptor/extrainfo_descriptor.py @@ -10,6 +10,8 @@ import test.runner from test.runner import only_run_once +from test.util import register_new_capability + class TestExtraInfoDescriptor(unittest.TestCase): @only_run_once @@ -41,10 +43,10 @@ class TestExtraInfoDescriptor(unittest.TestCase): elif desc.dir_v2_tunneled_dl_unknown: self.fail('Unrecognized stats on dirreq-v2-tunneled-dl lines: %s' % desc.dir_v2_tunneled_dl_unknown) elif unrecognized_lines: - # TODO: This isn't actually a problem, and rather than failing we - # should alert the user about these entries at the end of the tests - # (along with new events, getinfo options, and such). For now though - # there doesn't seem to be anything in practice to trigger this so - # failing to get our attention if it does. + # Forward-compability: + # 1) SHOULD function at least as it does normally (ignore the unknown) + # 2) Report each of the aditional (unrecognized) fields to the user - self.fail('Unrecognized descriptor content: %s' % unrecognized_lines) + for line in unrecognized_lines: + key = line.split()[0] + register_new_capability(key, 'Extrainfo Descriptor Entry') diff --git a/test/integ/descriptor/microdescriptor.py b/test/integ/descriptor/microdescriptor.py index ebd0287..0ea7ea1 100644 --- a/test/integ/descriptor/microdescriptor.py +++ b/test/integ/descriptor/microdescriptor.py @@ -10,6 +10,8 @@ import test.runner from test.runner import only_run_once +from test.util import register_new_capability + class TestMicrodescriptor(unittest.TestCase): @only_run_once @@ -31,4 +33,10 @@ class TestMicrodescriptor(unittest.TestCase): unrecognized_lines = desc.get_unrecognized_lines() if unrecognized_lines: - self.fail('Unrecognized microdescriptor content: %s' % unrecognized_lines) + # Forward-compability: + # 1) SHOULD function at least as it does normally (ignore the unknown) + # 2) Report each of the aditional (unrecognized) fields to the user + + for line in unrecognized_lines: + key = line.split()[0] + register_new_capability(key, 'Microdescriptor Descriptor Entry') diff --git a/test/integ/descriptor/networkstatus.py b/test/integ/descriptor/networkstatus.py index 8f97b26..21fdaf1 100644 --- a/test/integ/descriptor/networkstatus.py +++ b/test/integ/descriptor/networkstatus.py @@ -13,6 +13,8 @@ import test.runner from test.runner import only_run_once +from test.util import register_new_capability + class TestNetworkStatus(unittest.TestCase): @only_run_once @@ -38,17 +40,21 @@ class TestNetworkStatus(unittest.TestCase): for router in stem.descriptor.parse_file(descriptor_file, 'network-status-consensus-3 1.0', validate = True): count += 1 - # check if there's any unknown flags - # TODO: this should be a 'new capability' check later rather than - # failing the tests + # check if there's any unknown flags and report them to the user for flag in router.flags: if flag not in stem.Flag: - raise ValueError('Unrecognized flag type: %s, found on relay %s (%s)' % (flag, router.fingerprint, router.nickname)) + register_new_capability(flag, 'Network Flag') unrecognized_lines = router.get_unrecognized_lines() if unrecognized_lines: - self.fail('Unrecognized descriptor content: %s' % unrecognized_lines) + # Forward-compability: + # 1) SHOULD function at least as it does normally (ignore the unknown) + # 2) Report each of the aditional (unrecognized) fields to the user + + for line in unrecognized_lines: + key = line.split()[0] + register_new_capability(key, 'Network Descriptor Entry') # 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. @@ -75,16 +81,20 @@ class TestNetworkStatus(unittest.TestCase): for router in stem.descriptor.parse_file(descriptor_file, 'network-status-microdesc-consensus-3 1.0', validate = True): count += 1 - # check if there's any unknown flags - # TODO: this should be a 'new capability' check later rather than - # failing the tests + # check if there's any unknown flags and report them to the user for flag in router.flags: if flag not in stem.Flag: - raise ValueError('Unrecognized flag type: %s, found on microdescriptor relay %s (%s)' % (flag, router.fingerprint, router.nickname)) + register_new_capability(flag, 'Network Flag') unrecognized_lines = router.get_unrecognized_lines() if unrecognized_lines: - self.fail('Unrecognized descriptor content: %s' % unrecognized_lines) + # Forward-compability: + # 1) SHOULD function at least as it does normally (ignore the unknown) + # 2) Report each of the aditional (unrecognized) fields to the user + + for line in unrecognized_lines: + key = line.split()[0] + register_new_capability(key, 'Network Descriptor Entry') self.assertTrue(count > 100) diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index e7d49fd..1404cfa 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -11,7 +11,7 @@ import test.runner from test.runner import only_run_once -import test.util +from test.util import register_new_capability class TestServerDescriptor(unittest.TestCase): @@ -46,4 +46,4 @@ class TestServerDescriptor(unittest.TestCase): for line in unrecognized_lines: key = line.split()[0] - test.util.register_new_capability(key, 'Server Descriptor Entry') + register_new_capability(key, 'Server Descriptor Entry')

1 0

[stem/master] Adding missing event types
by atagar＠torproject.org 23 Mar '15

23 Mar '15

commit d1e3210829d0aadc011e7375f64829b134ba48b3 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 22 17:52:15 2015 -0700 Adding missing event types Turns out we have parsing support for all the missing events, just forgot to add it to the enum. --- stem/control.py | 72 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 31 deletions(-) diff --git a/stem/control.py b/stem/control.py index 68883d9..32e50d5 100644 --- a/stem/control.py +++ b/stem/control.py @@ -171,37 +171,42 @@ If you're fine with allowing your script to raise exceptions then this can be mo Enums are mapped to :class:`~stem.response.events.Event` subclasses as follows... - ===================== =========== - EventType Event Class - ===================== =========== - **ADDRMAP** :class:`stem.response.events.AddrMapEvent` - **AUTHDIR_NEWDESCS** :class:`stem.response.events.AuthDirNewDescEvent` - **BUILDTIMEOUT_SET** :class:`stem.response.events.BuildTimeoutSetEvent` - **BW** :class:`stem.response.events.BandwidthEvent` - **CIRC** :class:`stem.response.events.CircuitEvent` - **CIRC_MINOR** :class:`stem.response.events.CircMinorEvent` - **CLIENTS_SEEN** :class:`stem.response.events.ClientsSeenEvent` - **CONF_CHANGED** :class:`stem.response.events.ConfChangedEvent` - **DEBUG** :class:`stem.response.events.LogEvent` - **DESCCHANGED** :class:`stem.response.events.DescChangedEvent` - **ERR** :class:`stem.response.events.LogEvent` - **GUARD** :class:`stem.response.events.GuardEvent` - **HS_DESC** :class:`stem.response.events.HSDescEvent` - **HS_DESC_CONTENT** :class:`stem.response.events.HSDescContentEvent` - **INFO** :class:`stem.response.events.LogEvent` - **NEWCONSENSUS** :class:`stem.response.events.NewConsensusEvent` - **NEWDESC** :class:`stem.response.events.NewDescEvent` - **NOTICE** :class:`stem.response.events.LogEvent` - **NS** :class:`stem.response.events.NetworkStatusEvent` - **ORCONN** :class:`stem.response.events.ORConnEvent` - **SIGNAL** :class:`stem.response.events.SignalEvent` - **STATUS_CLIENT** :class:`stem.response.events.StatusEvent` - **STATUS_GENERAL** :class:`stem.response.events.StatusEvent` - **STATUS_SERVER** :class:`stem.response.events.StatusEvent` - **STREAM** :class:`stem.response.events.StreamEvent` - **STREAM_BW** :class:`stem.response.events.StreamBwEvent` - **WARN** :class:`stem.response.events.LogEvent` - ===================== =========== + ======================= =========== + EventType Event Class + ======================= =========== + **ADDRMAP** :class:`stem.response.events.AddrMapEvent` + **AUTHDIR_NEWDESCS** :class:`stem.response.events.AuthDirNewDescEvent` + **BUILDTIMEOUT_SET** :class:`stem.response.events.BuildTimeoutSetEvent` + **BW** :class:`stem.response.events.BandwidthEvent` + **CELL_STATS** :class:`stem.response.events.CellStatsEvent` + **CIRC** :class:`stem.response.events.CircuitEvent` + **CIRC_BW** :class:`stem.response.events.CircuitBandwidthEvent` + **CIRC_MINOR** :class:`stem.response.events.CircMinorEvent` + **CLIENTS_SEEN** :class:`stem.response.events.ClientsSeenEvent` + **CONF_CHANGED** :class:`stem.response.events.ConfChangedEvent` + **CONN_BW** :class:`stem.response.events.ConnectionBandwidthEvent` + **DEBUG** :class:`stem.response.events.LogEvent` + **DESCCHANGED** :class:`stem.response.events.DescChangedEvent` + **ERR** :class:`stem.response.events.LogEvent` + **GUARD** :class:`stem.response.events.GuardEvent` + **HS_DESC** :class:`stem.response.events.HSDescEvent` + **HS_DESC_CONTENT** :class:`stem.response.events.HSDescContentEvent` + **INFO** :class:`stem.response.events.LogEvent` + **NEWCONSENSUS** :class:`stem.response.events.NewConsensusEvent` + **NEWDESC** :class:`stem.response.events.NewDescEvent` + **NOTICE** :class:`stem.response.events.LogEvent` + **NS** :class:`stem.response.events.NetworkStatusEvent` + **ORCONN** :class:`stem.response.events.ORConnEvent` + **SIGNAL** :class:`stem.response.events.SignalEvent` + **STATUS_CLIENT** :class:`stem.response.events.StatusEvent` + **STATUS_GENERAL** :class:`stem.response.events.StatusEvent` + **STATUS_SERVER** :class:`stem.response.events.StatusEvent` + **STREAM** :class:`stem.response.events.StreamEvent` + **STREAM_BW** :class:`stem.response.events.StreamBwEvent` + **TB_EMPTY** :class:`stem.response.events.TokenBucketEmptyEvent` + **TRANSPORT_LAUNCHED** :class:`stem.response.events.TransportLaunchedEvent` + **WARN** :class:`stem.response.events.LogEvent` + ======================= =========== .. data:: Listener (enum) @@ -269,9 +274,12 @@ EventType = stem.util.enum.UppercaseEnum( 'AUTHDIR_NEWDESCS', 'BUILDTIMEOUT_SET', 'BW', + 'CELL_STATS', 'CIRC', + 'CIRC_BW', 'CIRC_MINOR', 'CONF_CHANGED', + 'CONN_BW', 'CLIENTS_SEEN', 'DEBUG', 'DESCCHANGED', @@ -291,6 +299,8 @@ EventType = stem.util.enum.UppercaseEnum( 'STATUS_SERVER', 'STREAM', 'STREAM_BW', + 'TB_EMPTY', + 'TRANSPORT_LAUNCHED', 'WARN', )

1 0

[stem/master] Check for new tor capabilities while testing
by atagar＠torproject.org 23 Mar '15

23 Mar '15

commit 90465332c74f3acaa101dd2f30c3d5a7c55b9691 Merge: d55b4ab d1e3210 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 22 18:23:51 2015 -0700 Check for new tor capabilities while testing Testing improvement from clv. As part of testing we now check to see if tor supports capabilities stem doesn't... https://trac.torproject.org/projects/tor/ticket/8250 If so we present this as part of our test output. For example... Your version of Tor has capabilities stem presently isn't taking advantage of. If you're running the latest version of stem then please file a ticket on: https://trac.torproject.org/projects/tor/wiki/doc/stem/bugs New capabilities are: [Event] CONN_BW [Event] CELL_STATS [Event] TB_EMPTY [Event] CIRC_BW [Event] TRANSPORT_LAUNCHED run_tests.py | 17 ++++++ stem/control.py | 72 ++++++++++++++----------- test/integ/control/controller.py | 32 +++++++++-- test/integ/descriptor/extrainfo_descriptor.py | 12 ++--- test/integ/descriptor/microdescriptor.py | 7 ++- test/integ/descriptor/networkstatus.py | 33 +++++------- test/integ/descriptor/server_descriptor.py | 13 ++--- test/util.py | 26 +++++++++ 8 files changed, 135 insertions(+), 77 deletions(-)

1 0

[bridgedb/develop] Add better checks for vanilla IPv4 bridge lines in test_https.py.
by isis＠torproject.org 23 Mar '15

23 Mar '15

commit 414e6a577441a3ceaa207ccb771b839370ff456c Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 23 00:13:54 2015 +0000 Add better checks for vanilla IPv4 bridge lines in test_https.py. --- lib/bridgedb/test/test_https.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index fe9e4e3..6a40a67 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -24,6 +24,7 @@ repository. from __future__ import print_function +import ipaddr import mechanize import os @@ -211,8 +212,9 @@ class HTTPTests(unittest.TestCase): captchaResponse=CAPTCHA_RESPONSE) bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=2) for bridge in bridges: - # TODO: do more interesting checks self.assertTrue(bridge != None) + addr = bridge[0].rsplit(':', 1)[0] + self.assertIsInstance(ipaddr.IPAddress(addr), ipaddr.IPv4Address) def test_get_scramblesuit_ipv4(self): if os.environ.get("CI"):

1 0

[tor-messenger-build/master] Use different port numbers for Tor Mail and Tor Messenger
by boklm＠torproject.org 23 Mar '15

23 Mar '15

commit e5874651a275739fc47fa96b4bab5cb2e723aec0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Mar 22 23:35:17 2015 +0100 Use different port numbers for Tor Mail and Tor Messenger --- projects/tor-launcher/build | 2 ++ projects/tor-launcher/config | 3 +++ projects/tor-launcher/controlport.patch | 25 ------------------------- projects/tor-launcher/controlport.patch.tmpl | 25 +++++++++++++++++++++++++ projects/tor-mail/build | 4 ++-- projects/tor-messenger/build | 4 ++-- rbm.conf | 4 ++++ 7 files changed, 38 insertions(+), 29 deletions(-) diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build index efee0f2..9a4a96f 100644 --- a/projects/tor-launcher/build +++ b/projects/tor-launcher/build @@ -3,6 +3,8 @@ set -e tar xvf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] patch -d src -p1 < ../topdir.patch +[% IF c("var/tor_control_port") -%] patch -p1 < ../controlport.patch +[% END -%] make package mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index dd2f1d1..7aca5ec 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -8,3 +8,6 @@ filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" input_files: - filename: topdir.patch - filename: controlport.patch + content: '[% INCLUDE controlport.patch.tmpl -%]' + refresh_input: 1 + enable: '[% c("var/tor_control_port") %]' diff --git a/projects/tor-launcher/controlport.patch b/projects/tor-launcher/controlport.patch deleted file mode 100644 index 7c9b904..0000000 --- a/projects/tor-launcher/controlport.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 08800fd6f225b05817e134fa465d1b83fb42be8e Mon Sep 17 00:00:00 2001 -From: Sukhbir Singh <sukhbir(a)torproject.org> -Date: Mon, 17 Nov 2014 22:50:47 +0530 -Subject: [PATCH 1/1] Set ControlPort to 9153 - ---- - src/defaults/preferences/prefs.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js -index 34bf1a7..b95b00f 100644 ---- a/src/defaults/preferences/prefs.js -+++ b/src/defaults/preferences/prefs.js -@@ -3,7 +3,7 @@ pref("extensions.torlauncher.logmethod", 1); // 0=stdout, 1=errorconsole, 2=deb - pref("extensions.torlauncher.max_tor_log_entries", 1000); - - pref("extensions.torlauncher.control_host", "127.0.0.1"); --pref("extensions.torlauncher.control_port", 9151); -+pref("extensions.torlauncher.control_port", 9153); - - pref("extensions.torlauncher.start_tor", true); - pref("extensions.torlauncher.prompt_at_startup", true); --- -2.1.3 - diff --git a/projects/tor-launcher/controlport.patch.tmpl b/projects/tor-launcher/controlport.patch.tmpl new file mode 100644 index 0000000..cc5656b --- /dev/null +++ b/projects/tor-launcher/controlport.patch.tmpl @@ -0,0 +1,25 @@ +From 08800fd6f225b05817e134fa465d1b83fb42be8e Mon Sep 17 00:00:00 2001 +From: Sukhbir Singh <sukhbir(a)torproject.org> +Date: Mon, 17 Nov 2014 22:50:47 +0530 +Subject: [PATCH 1/1] Set ControlPort to [% c("var/tor_control_port") %] + +--- + src/defaults/preferences/prefs.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js +index 34bf1a7..b95b00f 100644 +--- a/src/defaults/preferences/prefs.js ++++ b/src/defaults/preferences/prefs.js +@@ -3,7 +3,7 @@ pref("extensions.torlauncher.logmethod", 1); // 0=stdout, 1=errorconsole, 2=deb + pref("extensions.torlauncher.max_tor_log_entries", 1000); + + pref("extensions.torlauncher.control_host", "127.0.0.1"); +-pref("extensions.torlauncher.control_port", 9151); ++pref("extensions.torlauncher.control_port", [% c("var/tor_control_port") %]); + + pref("extensions.torlauncher.start_tor", true); + pref("extensions.torlauncher.prompt_at_startup", true); +-- +2.1.3 + diff --git a/projects/tor-mail/build b/projects/tor-mail/build index 135f9fe..c2b7498 100644 --- a/projects/tor-mail/build +++ b/projects/tor-mail/build @@ -28,8 +28,8 @@ mv \$_OUTDIR tor-browser_en-US [% ELSE -%] tar xf ../../../[% c('input_files_by_name/tor-browser') %] [% END -%] -sed -i 's/^SocksPort .*/SocksPort 9152/' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults -sed -i 's/^ControlPort .*/ControlPort 9153/' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults +sed -i 's/^SocksPort .*/SocksPort [% c("var/tor_socks_port") %]/' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults +sed -i 's/^ControlPort .*/ControlPort [% c("var/tor_control_port") %]/' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults mv tor-browser_en-US/Browser/TorBrowser/Tor tor-launcher(a)torproject.org/TorBrowser/Tor mv tor-browser_en-US/Browser/TorBrowser/Data/Tor tor-launcher(a)torproject.org/TorBrowser/Data/Tor rm -Rf tor-browser_en-US diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 60cb99c..4cceecc 100644 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -30,8 +30,8 @@ mv \$_OUTDIR tor-browser_en-US [% ELSE -%] tar xf ../../../[% c('input_files_by_name/tor-browser') %] [% END -%] -sed -i 's/^SocksPort .*/SocksPort 9152/' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults -sed -i 's/^ControlPort .*/ControlPort 9153/' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults +sed -i 's/^SocksPort .*/SocksPort [% c("var/tor_socks_port") %]/' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults +sed -i 's/^ControlPort .*/ControlPort [% c("var/tor_control_port") %]/' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults mv tor-browser_en-US/Browser/TorBrowser/Tor tor-launcher(a)torproject.org/TorBrowser/Tor mv tor-browser_en-US/Browser/TorBrowser/Data/Tor tor-launcher(a)torproject.org/TorBrowser/Data/Tor rm -Rf tor-browser_en-US diff --git a/rbm.conf b/rbm.conf index d4bdf8f..715be53 100644 --- a/rbm.conf +++ b/rbm.conf @@ -70,10 +70,14 @@ targets: tor-messenger: var: tor-messenger: 1 + tor_socks_port: 9152 + tor_control_port: 9153 tor-mail: var: tor-mail: 1 + tor_socks_port: 9154 + tor_control_port: 9155 # The no_build_id target can be useful if you want to quickly display # a build template or other option but don't want to spend time to

1 0

[stem/master] Speed up event receipt tests
by atagar＠torproject.org 23 Mar '15

23 Mar '15

commit 6d4d4816ff5cea7611bde36256d1f1b5e9eab5e9 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Mar 21 04:37:03 2015 +0100 Speed up event receipt tests Use CONF_CHANGED instead of BW events, they arrive much quicker and don't require us to wait so long. Execution time for the controller tests go from 1m25.348s to 0m6.053s when selecting all connection configurations. --- run_tests.py | 9 ++--- test/integ/control/controller.py | 72 ++++++++++++++++++++------------------ 2 files changed, 43 insertions(+), 38 deletions(-) diff --git a/run_tests.py b/run_tests.py index 912a8d3..7ae495e 100755 --- a/run_tests.py +++ b/run_tests.py @@ -11,6 +11,7 @@ import sys import threading import time import unittest +import traceback try: from StringIO import StringIO @@ -339,13 +340,13 @@ def _run_test(args, test_class, output_filters, logging_buffer): try: suite = unittest.TestLoader().loadTestsFromName(test_class) - except AttributeError, e: + except AttributeError as e: # should only come up if user provided '--test' for something that doesn't exist - println(e, ERROR) + println("%s\n" % e, ERROR) println(" no such test", ERROR) return None - except Exception, e: - println(e, ERROR) + except Exception as e: + println("%s\n" % e, ERROR) println(" failed", ERROR) return None diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 0a0e112..7873acc 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -39,10 +39,6 @@ TEST_ROUTER_STATUS_ENTRY = None class TestController(unittest.TestCase): - # TODO: We should find an event we can reliably trigger rather than using BW - # events with sleeps. This both slows our tests and can be unreliable on - # systems under a heavy load. - def test_from_port(self): """ Basic sanity check for the from_port constructor. @@ -123,17 +119,18 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() with runner.get_tor_controller() as controller: - controller.add_event_listener(listener1, EventType.BW) - controller.add_event_listener(listener2, EventType.BW, EventType.DEBUG) + controller.add_event_listener(listener1, EventType.CONF_CHANGED) + controller.add_event_listener(listener2, EventType.CONF_CHANGED, EventType.DEBUG) - # BW events occure at the rate of one per second, so wait a bit to let - # some accumulate. + # The NodeFamily is a harmless option we can toggle + controller.set_conf('NodeFamily', 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF') - event_notice1.wait(4) - self.assertTrue(len(event_buffer1) >= 1) + # Wait for the event. Assert that we get it within 10 seconds + self.assertTrue(event_notice1.wait(10)) + self.assertEqual(len(event_buffer1), 1) event_notice1.clear() - event_notice2.wait(4) + self.assertTrue(event_notice2.wait(10)) self.assertTrue(len(event_buffer2) >= 1) event_notice2.clear() @@ -143,20 +140,19 @@ class TestController(unittest.TestCase): buffer2_size = len(event_buffer2) - event_notice1.wait(4) - self.assertTrue(len(event_buffer1) >= 2) + controller.set_conf('NodeFamily', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA') + self.assertTrue(event_notice1.wait(10)) + self.assertEqual(len(event_buffer1), 2) + event_notice1.clear() - event_notice2.wait(4) self.assertEqual(buffer2_size, len(event_buffer2)) for event in event_buffer1: self.assertTrue(isinstance(event, stem.response.events.Event)) - self.assertEqual(2, len(event.positional_args)) + self.assertEqual(0, len(event.positional_args)) self.assertEqual({}, event.keyword_args) - self.assertTrue(isinstance(event, stem.response.events.BandwidthEvent)) - self.assertTrue(hasattr(event, 'read')) - self.assertTrue(hasattr(event, 'written')) + self.assertTrue(isinstance(event, stem.response.events.ConfChangedEvent)) @require_controller def test_reattaching_listeners(self): @@ -175,13 +171,12 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() with runner.get_tor_controller() as controller: - controller.add_event_listener(listener, EventType.BW) + controller.add_event_listener(listener, EventType.CONF_CHANGED) - # Get a BW event or two. These should be emitted each second but under - # heavy system load that's not always the case. - - event_notice.wait(4) - self.assertTrue(len(event_buffer) >= 1) + controller.set_conf('NodeFamily', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA') + self.assertTrue(event_notice.wait(10)) + self.assertEqual(len(event_buffer), 1) + event_notice.clear() # disconnect and check that we stop getting events @@ -189,21 +184,27 @@ class TestController(unittest.TestCase): event_notice.clear() event_buffer = [] - event_notice.wait(2) - self.assertTrue(len(event_buffer) == 0) + # Spawn a second controller and trigger an event + controller2 = runner.get_tor_controller() + controller2.connect() + controller2.authenticate(password = test.runner.CONTROL_PASSWORD) + controller2.set_conf('NodeFamily', 'BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB') + controller2.close() + self.assertEqual(len(event_buffer), 0) # reconnect and check that we get events again controller.connect() controller.authenticate(password = test.runner.CONTROL_PASSWORD) - event_notice.wait(4) - self.assertTrue(len(event_buffer) >= 1) + controller.set_conf('NodeFamily', 'CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC') + self.assertTrue(event_notice.wait(10)) + self.assertEqual(len(event_buffer), 1) + event_notice.clear() # disconnect controller.close() - event_notice.clear() event_buffer = [] # reconnect and check that we get events again @@ -211,13 +212,14 @@ class TestController(unittest.TestCase): controller.connect() stem.connection.authenticate(controller, password = test.runner.CONTROL_PASSWORD) - event_notice.wait(4) - self.assertTrue(len(event_buffer) >= 1) + controller.set_conf('NodeFamily', 'DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD') + self.assertTrue(event_notice.wait(10)) + self.assertEqual(len(event_buffer), 1) + event_notice.clear() # disconnect controller.close() - event_notice.clear() event_buffer = [] # Reconnect and check that we get events again. This is being done by @@ -233,8 +235,10 @@ class TestController(unittest.TestCase): else: controller.msg('AUTHENTICATE') - event_notice.wait(4) - self.assertTrue(len(event_buffer) >= 1) + controller.set_conf('NodeFamily', 'EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE') + self.assertTrue(event_notice.wait(10)) + self.assertEqual(len(event_buffer), 1) + event_notice.clear() @require_controller def test_getinfo(self):

1 0