October 2020 - tor-commits - lists.torproject.org

[stem/master] Move list_circuits test
by atagar＠torproject.org 03 Oct '20

03 Oct '20

commit faa569fcbe8a8d5bb1014c2961478a33465d113e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 26 18:08:45 2020 -0700 Move list_circuits test Yikes. We have *three* test modules for our website examples... * tutorial.py, made in 2012 * tutorial_examples.py, made in 2014 * examples.py, from this branch I've worked on Stem for so long clearly even I can't keep all our tests straight. These modules cover a subset of our tutorial examples, so beginning to merge them into examples.py. Unlike them, examples.py checks for new example scripts so we'll finally stop re-inventing this wheel. --- docs/_static/example/list_circuits.py | 6 ++-- stem/response/events.py | 4 +++ test/unit/examples.py | 58 +++++++++++++++++++++++++++++++++-- test/unit/tutorial_examples.py | 49 ----------------------------- 4 files changed, 63 insertions(+), 54 deletions(-) diff --git a/docs/_static/example/list_circuits.py b/docs/_static/example/list_circuits.py index b89e99fc..aff3b211 100644 --- a/docs/_static/example/list_circuits.py +++ b/docs/_static/example/list_circuits.py @@ -8,8 +8,8 @@ with Controller.from_port(port = 9051) as controller: if circ.status != CircStatus.BUILT: continue - print("") - print("Circuit %s (%s)" % (circ.id, circ.purpose)) + print('') + print('Circuit %s (%s)' % (circ.id, circ.purpose)) for i, entry in enumerate(circ.path): div = '+' if (i == len(circ.path) - 1) else '|' @@ -18,4 +18,4 @@ with Controller.from_port(port = 9051) as controller: desc = controller.get_network_status(fingerprint, None) address = desc.address if desc else 'unknown' - print(" %s- %s (%s, %s)" % (div, fingerprint, nickname, address)) + print(' %s- %s (%s, %s)' % (div, fingerprint, nickname, address)) diff --git a/stem/response/events.py b/stem/response/events.py index 300d02d0..d9d46d6a 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -417,6 +417,10 @@ class CircuitEvent(Event): my_id = getattr(self, 'id') their_id = getattr(other, 'id') + if my_id.isdigit() and their_id.isdigit(): + my_id = int(my_id) + their_id = int(their_id) + return method(my_id, their_id) if my_id != their_id else method(hash(self), hash(other)) def __gt__(self, other: Any) -> bool: diff --git a/test/unit/examples.py b/test/unit/examples.py index 7c801ece..30375ea3 100644 --- a/test/unit/examples.py +++ b/test/unit/examples.py @@ -104,6 +104,24 @@ EXPECTED_COLLECTOR_READING = """\ caerSidi (4F0C867DF0EF68160568C826838F482CEA7CFE44) """ +EXPECTED_LIST_CIRCUITS = """\ + +Circuit 4 (GENERAL) + |- B1FA7D51B8B6F0CB585D944F450E7C06EDE7E44C (ByTORAndTheSnowDog, 173.209.180.61) + |- 0DD9935C5E939CFA1E07B8DDA6D91C1A2A9D9338 (afo02, 87.238.194.176) + +- DB3B1CFBD3E4D97B84B548ADD5B9A31451EEC4CC (edwardsnowden3, 109.163.234.10) + +Circuit 6 (GENERAL) + |- B1FA7D51B8B6F0CB585D944F450E7C06EDE7E44C (ByTORAndTheSnowDog, 173.209.180.61) + |- EC01CB4766BADC1611678555CE793F2A7EB2D723 (sprockets, 46.165.197.96) + +- 9EA317EECA56BDF30CAEB208A253FB456EDAB1A0 (bolobolo1, 96.47.226.20) + +Circuit 10 (GENERAL) + |- B1FA7D51B8B6F0CB585D944F450E7C06EDE7E44C (ByTORAndTheSnowDog, 173.209.180.61) + |- 00C2C2A16AEDB51D5E5FB7D6168FC66B343D822F (ph3x, 86.59.119.83) + +- 65242C91BFF30F165DA4D132C81A9EBA94B71D62 (torexit16, 176.67.169.171) +""" + class TestExamples(unittest.TestCase): def setUp(self): @@ -328,8 +346,44 @@ class TestExamples(unittest.TestCase): def test_introduction_points(self): pass - def test_list_circuits(self): - pass + @patch('stem.control.Controller.from_port', spec = Controller) + @patch('sys.stdout', new_callable = io.StringIO) + def test_list_circuits(self, stdout_mock, from_port_mock): + def _get_circ_event(circ_id, hop1, hop2, hop3): + path = '$%s=%s,$%s=%s,$%s=%s' % (hop1[0], hop1[1], hop2[0], hop2[1], hop3[0], hop3[1]) + content = '650 CIRC %i BUILT %s PURPOSE=GENERAL' % (circ_id, path) + return ControlMessage.from_str(content, 'EVENT', normalize = True) + + path_1 = ('B1FA7D51B8B6F0CB585D944F450E7C06EDE7E44C', 'ByTORAndTheSnowDog') + path_2 = ('0DD9935C5E939CFA1E07B8DDA6D91C1A2A9D9338', 'afo02') + path_3 = ('DB3B1CFBD3E4D97B84B548ADD5B9A31451EEC4CC', 'edwardsnowden3') + path_4 = ('EC01CB4766BADC1611678555CE793F2A7EB2D723', 'sprockets') + path_5 = ('9EA317EECA56BDF30CAEB208A253FB456EDAB1A0', 'bolobolo1') + path_6 = ('00C2C2A16AEDB51D5E5FB7D6168FC66B343D822F', 'ph3x') + path_7 = ('65242C91BFF30F165DA4D132C81A9EBA94B71D62', 'torexit16') + + circuit_4 = _get_circ_event(4, path_1, path_2, path_3) + circuit_6 = _get_circ_event(6, path_1, path_4, path_5) + circuit_10 = _get_circ_event(10, path_1, path_6, path_7) + + controller = from_port_mock().__enter__() + controller.get_circuits.return_value = [circuit_4, circuit_6, circuit_10] + + r_line = 'caerSidi p1aag7VwarGxqctS7/fS0y5FU+s oQZFLYe9e4A7bOkWKR7TaNxb0JE 2012-08-06 11:19:31 %s 9001 0' + + controller.get_network_status.side_effect = lambda fingerprint, *args: { + path_1[0]: RouterStatusEntryV3.create({'r': r_line % '173.209.180.61'}), + path_2[0]: RouterStatusEntryV3.create({'r': r_line % '87.238.194.176'}), + path_3[0]: RouterStatusEntryV3.create({'r': r_line % '109.163.234.10'}), + path_4[0]: RouterStatusEntryV3.create({'r': r_line % '46.165.197.96'}), + path_5[0]: RouterStatusEntryV3.create({'r': r_line % '96.47.226.20'}), + path_6[0]: RouterStatusEntryV3.create({'r': r_line % '86.59.119.83'}), + path_7[0]: RouterStatusEntryV3.create({'r': r_line % '176.67.169.171'}), + }[fingerprint] + + import list_circuits + + self.assertEqual(EXPECTED_LIST_CIRCUITS, stdout_mock.getvalue()) def test_load_test(self): pass diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index 5ccf1ce2..d673662f 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -26,24 +26,6 @@ PURPOSE=%s' PATH_CONTENT = '$%s=%s,$%s=%s,$%s=%s' -LIST_CIRCUITS_OUTPUT = """\ - -Circuit 4 (GENERAL) - |- B1FA7D51B8B6F0CB585D944F450E7C06EDE7E44C (ByTORAndTheSnowDog, 173.209.180.61) - |- 0DD9935C5E939CFA1E07B8DDA6D91C1A2A9D9338 (afo02, 87.238.194.176) - +- DB3B1CFBD3E4D97B84B548ADD5B9A31451EEC4CC (edwardsnowden3, 109.163.234.10) - -Circuit 6 (GENERAL) - |- B1FA7D51B8B6F0CB585D944F450E7C06EDE7E44C (ByTORAndTheSnowDog, 173.209.180.61) - |- EC01CB4766BADC1611678555CE793F2A7EB2D723 (sprockets, 46.165.197.96) - +- 9EA317EECA56BDF30CAEB208A253FB456EDAB1A0 (bolobolo1, 96.47.226.20) - -Circuit 10 (GENERAL) - |- B1FA7D51B8B6F0CB585D944F450E7C06EDE7E44C (ByTORAndTheSnowDog, 173.209.180.61) - |- 00C2C2A16AEDB51D5E5FB7D6168FC66B343D822F (ph3x, 86.59.119.83) - +- 65242C91BFF30F165DA4D132C81A9EBA94B71D62 (torexit16, 176.67.169.171) -""" - EXIT_USED_OUTPUT = """\ Tracking requests for tor exits. Press 'enter' to end. @@ -117,37 +99,6 @@ def _get_router_status(address = None, port = None, nickname = None, fingerprint class TestTutorialExamples(unittest.TestCase): - @patch('sys.stdout', new_callable = io.StringIO) - @patch('stem.control.Controller.from_port', spec = Controller) - def test_list_circuits(self, from_port_mock, stdout_mock): - path_1 = ('B1FA7D51B8B6F0CB585D944F450E7C06EDE7E44C', 'ByTORAndTheSnowDog') - path_2 = ('0DD9935C5E939CFA1E07B8DDA6D91C1A2A9D9338', 'afo02') - path_3 = ('DB3B1CFBD3E4D97B84B548ADD5B9A31451EEC4CC', 'edwardsnowden3') - path_4 = ('EC01CB4766BADC1611678555CE793F2A7EB2D723', 'sprockets') - path_5 = ('9EA317EECA56BDF30CAEB208A253FB456EDAB1A0', 'bolobolo1') - path_6 = ('00C2C2A16AEDB51D5E5FB7D6168FC66B343D822F', 'ph3x') - path_7 = ('65242C91BFF30F165DA4D132C81A9EBA94B71D62', 'torexit16') - - circuit_4 = _get_circ_event(4, 'BUILT', path_1, path_2, path_3, 'GENERAL') - circuit_6 = _get_circ_event(6, 'BUILT', path_1, path_4, path_5, 'GENERAL') - circuit_10 = _get_circ_event(10, 'BUILT', path_1, path_6, path_7, 'GENERAL') - - controller = from_port_mock().__enter__() - controller.get_circuits.return_value = [circuit_4, circuit_6, circuit_10] - - controller.get_network_status.side_effect = lambda fingerprint, *args: { - path_1[0]: _get_router_status('173.209.180.61'), - path_2[0]: _get_router_status('87.238.194.176'), - path_3[0]: _get_router_status('109.163.234.10'), - path_4[0]: _get_router_status('46.165.197.96'), - path_5[0]: _get_router_status('96.47.226.20'), - path_6[0]: _get_router_status('86.59.119.83'), - path_7[0]: _get_router_status('176.67.169.171') - }[fingerprint] - - exec_documentation_example('list_circuits.py') - self.assertCountEqual(LIST_CIRCUITS_OUTPUT.splitlines(), stdout_mock.getvalue().splitlines()) - @patch('sys.stdout', new_callable = io.StringIO) @patch('stem.control.Controller.from_port', spec = Controller) def test_exit_used(self, from_port_mock, stdout_mock):

1 0

[stem/master] Test collector_caching example
by atagar＠torproject.org 03 Oct '20

03 Oct '20

commit 4bfaa5b7cdba1a533f7241a28e0e4286e1be081e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 26 15:14:57 2020 -0700 Test collector_caching example --- test/unit/examples.py | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/test/unit/examples.py b/test/unit/examples.py index 521a7937..7c801ece 100644 --- a/test/unit/examples.py +++ b/test/unit/examples.py @@ -19,6 +19,7 @@ from stem.descriptor.bandwidth_file import BandwidthFile from stem.descriptor.extrainfo_descriptor import RelayExtraInfoDescriptor from stem.descriptor.router_status_entry import RouterStatusEntryV3 from stem.descriptor.server_descriptor import RelayDescriptor +from stem.exit_policy import ExitPolicy from stem.response import ControlMessage from unittest.mock import Mock, patch @@ -97,6 +98,12 @@ EXPECTED_COLLECTOR_CACHING = """\ flubber (5C2124E6C5DD75C3C17C03EEA5A51812773DE671) """ +EXPECTED_COLLECTOR_READING = """\ +1 relays published an exiting policy today... + + caerSidi (4F0C867DF0EF68160568C826838F482CEA7CFE44) +""" + class TestExamples(unittest.TestCase): def setUp(self): @@ -256,8 +263,19 @@ class TestExamples(unittest.TestCase): self.assertEqual(EXPECTED_COLLECTOR_CACHING, stdout_mock.getvalue()) - def test_collector_reading(self): - pass + @patch('stem.descriptor.collector.CollecTor.get_server_descriptors') + @patch('sys.stdout', new_callable = io.StringIO) + def test_collector_reading(self, stdout_mock, server_desc_mock): + server_desc_mock.return_value = [ + RelayDescriptor.create({ + 'router': 'caerSidi 71.35.133.197 9001 0 0', + 'fingerprint': '4F0C 867D F0EF 6816 0568 C826 838F 482C EA7C FE44', + }, exit_policy = ExitPolicy('accept *:*')), + ] + + import collector_reading + + self.assertEqual(EXPECTED_COLLECTOR_READING, stdout_mock.getvalue()) def test_compare_flags(self): pass

1 0

[stem/master] TODO note to expand Descriptor.create()
by atagar＠torproject.org 03 Oct '20

03 Oct '20

commit e2ef267c68e43de7fa9b9fd126192c037bd04a24 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 26 15:11:25 2020 -0700 TODO note to expand Descriptor.create() TODO note to expand our Descriptor's create() and content() methods. These were originally private methods within our tests. I productionized and opened them for Isis so BridgeDB could replace Lector. We use descriptor content as their input arguments for a couple reasons... 1. It's agnostic to the descriptor type, so all Descriptors can largely share a constructor. 2. This was the input our tests originally wanted to make test descriptors from. However, it makes creating descriptors cumbersome. For instance, if I simply want to make a server descriptor with my nickname I need to run... RelayDescriptor.create({'router': 'caerSidi 71.35.133.197 9001 0 0'}) Wouldn't this be a lot better if it was simply the following? RelayDescriptor.create(nickname = 'caerSidi') However, doing this is easier said than done. Doing so will require reverse mapping attributes to line content (that is to say, convert 'nickname =' into something like the above router line. Oh well. Project for another time when I rethink our Descriptor APIs. --- stem/descriptor/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 58a88d55..3f10bc57 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -921,6 +921,9 @@ class Descriptor(object): * **NotImplementedError** if not implemented for this descriptor type """ + # TODO: add support for creating descriptors with preset parameters (rather + # than line content) + return cls(cls.content(attr, exclude), validate = validate) # type: ignore def type_annotation(self) -> 'stem.descriptor.TypeAnnotation':

1 0

[stem/master] Move exit_used test
by atagar＠torproject.org 03 Oct '20

03 Oct '20

commit 87446136328bddbbd0cbecf931349a4cdd029518 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 26 23:08:51 2020 -0700 Move exit_used test Seriously? I copy-pasted the tutorial example into our test? That is... embarrasing. --- docs/_static/example/exit_used.py | 2 +- test/unit/examples.py | 52 +++++++++++++++++++++++++------- test/unit/tutorial_examples.py | 63 --------------------------------------- 3 files changed, 43 insertions(+), 74 deletions(-) diff --git a/docs/_static/example/exit_used.py b/docs/_static/example/exit_used.py index 9a16c130..fde2db84 100644 --- a/docs/_static/example/exit_used.py +++ b/docs/_static/example/exit_used.py @@ -13,7 +13,7 @@ def main(): stream_listener = functools.partial(stream_event, controller) controller.add_event_listener(stream_listener, EventType.STREAM) - raw_input() # wait for user to press enter + input() # wait for user to press enter def stream_event(controller, event): diff --git a/test/unit/examples.py b/test/unit/examples.py index 30375ea3..efdac292 100644 --- a/test/unit/examples.py +++ b/test/unit/examples.py @@ -4,6 +4,7 @@ Exercise the code in our examples directory. import base64 import binascii +import functools import io import os import sys @@ -104,6 +105,17 @@ EXPECTED_COLLECTOR_READING = """\ caerSidi (4F0C867DF0EF68160568C826838F482CEA7CFE44) """ +EXPECTED_EXIT_USED = """\ +Tracking requests for tor exits. Press 'enter' to end. + +Exit relay for our connection to 64.15.112.44:80 + address: 31.172.30.2:443 + fingerprint: A59E1E7C7EAEE083D756EE1FF6EC31CA3D8651D7 + nickname: chaoscomputerclub19 + locale: unknown + +""" + EXPECTED_LIST_CIRCUITS = """\ Circuit 4 (GENERAL) @@ -123,6 +135,12 @@ Circuit 10 (GENERAL) """ +def _make_circ_event(circ_id, hop1, hop2, hop3): + path = '$%s=%s,$%s=%s,$%s=%s' % (hop1[0], hop1[1], hop2[0], hop2[1], hop3[0], hop3[1]) + content = '650 CIRC %i BUILT %s PURPOSE=GENERAL' % (circ_id, path) + return ControlMessage.from_str(content, 'EVENT', normalize = True) + + class TestExamples(unittest.TestCase): def setUp(self): self.original_path = list(sys.path) @@ -328,8 +346,27 @@ class TestExamples(unittest.TestCase): def test_event_listening(self): pass - def test_exit_used(self): - pass + @patch('stem.control.Controller.from_port', spec = Controller) + @patch('sys.stdout', new_callable = io.StringIO) + def test_exit_used(self, stdout_mock, from_port_mock): + path_1 = ('9EA317EECA56BDF30CAEB208A253FB456EDAB1A0', 'bolobolo1') + path_2 = ('00C2C2A16AEDB51D5E5FB7D6168FC66B343D822F', 'ph3x') + path_3 = ('A59E1E7C7EAEE083D756EE1FF6EC31CA3D8651D7', 'chaoscomputerclub19') + + event = ControlMessage.from_str('650 STREAM 15 SUCCEEDED 3 64.15.112.44:80', 'EVENT', normalize = True) + r_line = '%s pZ4efH6u4IPXVu4f9uwxyj2GUdc= oQZFLYe9e4A7bOkWKR7TaNxb0JE 2012-08-06 11:19:31 31.172.30.2 443 0' + + controller = from_port_mock().__enter__() + controller.get_circuit.return_value = _make_circ_event(1, path_1, path_2, path_3) + controller.get_network_status.return_value = RouterStatusEntryV3.create({'r': r_line % path_3[1]}) + controller.get_info.return_value = 'unknown' + + import exit_used + + with patch('builtins.input', Mock(side_effect = functools.partial(exit_used.stream_event, controller, event))): + exit_used.main() + + self.assertEqual(EXPECTED_EXIT_USED, stdout_mock.getvalue()) def test_fibonacci_multiprocessing(self): pass @@ -349,11 +386,6 @@ class TestExamples(unittest.TestCase): @patch('stem.control.Controller.from_port', spec = Controller) @patch('sys.stdout', new_callable = io.StringIO) def test_list_circuits(self, stdout_mock, from_port_mock): - def _get_circ_event(circ_id, hop1, hop2, hop3): - path = '$%s=%s,$%s=%s,$%s=%s' % (hop1[0], hop1[1], hop2[0], hop2[1], hop3[0], hop3[1]) - content = '650 CIRC %i BUILT %s PURPOSE=GENERAL' % (circ_id, path) - return ControlMessage.from_str(content, 'EVENT', normalize = True) - path_1 = ('B1FA7D51B8B6F0CB585D944F450E7C06EDE7E44C', 'ByTORAndTheSnowDog') path_2 = ('0DD9935C5E939CFA1E07B8DDA6D91C1A2A9D9338', 'afo02') path_3 = ('DB3B1CFBD3E4D97B84B548ADD5B9A31451EEC4CC', 'edwardsnowden3') @@ -362,9 +394,9 @@ class TestExamples(unittest.TestCase): path_6 = ('00C2C2A16AEDB51D5E5FB7D6168FC66B343D822F', 'ph3x') path_7 = ('65242C91BFF30F165DA4D132C81A9EBA94B71D62', 'torexit16') - circuit_4 = _get_circ_event(4, path_1, path_2, path_3) - circuit_6 = _get_circ_event(6, path_1, path_4, path_5) - circuit_10 = _get_circ_event(10, path_1, path_6, path_7) + circuit_4 = _make_circ_event(4, path_1, path_2, path_3) + circuit_6 = _make_circ_event(6, path_1, path_4, path_5) + circuit_10 = _make_circ_event(10, path_1, path_6, path_7) controller = from_port_mock().__enter__() controller.get_circuits.return_value = [circuit_4, circuit_6, circuit_10] diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index d673662f..4df9f6c4 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -9,7 +9,6 @@ import unittest from unittest.mock import Mock, patch -from stem.control import Controller from stem.descriptor.networkstatus import NetworkStatusDocumentV3 from stem.descriptor.router_status_entry import RouterStatusEntryV3 from stem.descriptor.server_descriptor import RelayDescriptor @@ -26,17 +25,6 @@ PURPOSE=%s' PATH_CONTENT = '$%s=%s,$%s=%s,$%s=%s' -EXIT_USED_OUTPUT = """\ -Tracking requests for tor exits. Press 'enter' to end. - -Exit relay for our connection to 64.15.112.44:80 - address: 31.172.30.2:443 - fingerprint: A59E1E7C7EAEE083D756EE1FF6EC31CA3D8651D7 - nickname: chaoscomputerclub19 - locale: unknown - -""" - OUTDATED_RELAYS_OUTPUT = """\ Checking for outdated relays... @@ -99,57 +87,6 @@ def _get_router_status(address = None, port = None, nickname = None, fingerprint class TestTutorialExamples(unittest.TestCase): - @patch('sys.stdout', new_callable = io.StringIO) - @patch('stem.control.Controller.from_port', spec = Controller) - def test_exit_used(self, from_port_mock, stdout_mock): - def tutorial_example(mock_event): - import functools - - from stem import StreamStatus - from stem.control import EventType, Controller - - def main(): - print("Tracking requests for tor exits. Press 'enter' to end.\n") - - with Controller.from_port() as controller: - controller.authenticate() - - stream_listener = functools.partial(stream_event, controller) - controller.add_event_listener(stream_listener, EventType.STREAM) - - stream_event(controller, mock_event) # simulate an event during the raw_input() - - def stream_event(controller, event): - if event.status == StreamStatus.SUCCEEDED and event.circ_id: - circ = controller.get_circuit(event.circ_id) - - exit_fingerprint = circ.path[-1][0] - exit_relay = controller.get_network_status(exit_fingerprint) - - print('Exit relay for our connection to %s' % (event.target)) - print(' address: %s:%i' % (exit_relay.address, exit_relay.or_port)) - print(' fingerprint: %s' % exit_relay.fingerprint) - print(' nickname: %s' % exit_relay.nickname) - print(' locale: %s\n' % controller.get_info('ip-to-country/%s' % exit_relay.address, 'unknown')) - - main() - - path_1 = ('9EA317EECA56BDF30CAEB208A253FB456EDAB1A0', 'bolobolo1') - path_2 = ('00C2C2A16AEDB51D5E5FB7D6168FC66B343D822F', 'ph3x') - path_3 = ('A59E1E7C7EAEE083D756EE1FF6EC31CA3D8651D7', 'chaoscomputerclub19') - circuit = _get_circ_event(1, 'BUILT', path_1, path_2, path_3, 'GENERAL') - - event_content = '650 STREAM 15 SUCCEEDED 3 64.15.112.44:80' - event = _get_event(event_content) - - controller = from_port_mock().__enter__() - controller.get_circuit.return_value = circuit - controller.get_network_status.return_value = _get_router_status('31.172.30.2', '443', path_3[1], 'pZ4efH6u4IPXVu4f9uwxyj2GUdc=') - controller.get_info.return_value = 'unknown' - - tutorial_example(event) - self.assertCountEqual(EXIT_USED_OUTPUT.splitlines(), stdout_mock.getvalue().splitlines()) - @patch('sys.stdout', new_callable = io.StringIO) @patch('stem.descriptor.remote.DescriptorDownloader') def test_outdated_relays(self, downloader_mock, stdout_mock):

1 0

[stem/master] Move outdated_relays test
by atagar＠torproject.org 03 Oct '20

03 Oct '20

commit 9d328a42919f96bb43ac73ddf6e86736174d7d77 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 27 14:13:29 2020 -0700 Move outdated_relays test --- test/unit/examples.py | 23 +++++++++++++++++++++-- test/unit/tutorial_examples.py | 23 ----------------------- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/test/unit/examples.py b/test/unit/examples.py index efdac292..0fa140ab 100644 --- a/test/unit/examples.py +++ b/test/unit/examples.py @@ -134,6 +134,14 @@ Circuit 10 (GENERAL) +- 65242C91BFF30F165DA4D132C81A9EBA94B71D62 (torexit16, 176.67.169.171) """ +EXPECTED_OUTDATED_RELAYS = """\ +Checking for outdated relays... + + 0.1.0 Sambuddha Basu + +2 outdated relays found, 1 had contact information +""" + def _make_circ_event(circ_id, hop1, hop2, hop3): path = '$%s=%s,$%s=%s,$%s=%s' % (hop1[0], hop1[1], hop2[0], hop2[1], hop3[0], hop3[1]) @@ -423,8 +431,19 @@ class TestExamples(unittest.TestCase): def test_manual_config_options(self): pass - def test_outdated_relays(self): - pass + @patch('stem.descriptor.remote.DescriptorDownloader') + @patch('sys.stdout', new_callable = io.StringIO) + def test_outdated_relays(self, stdout_mock, downloader_mock): + downloader_mock().get_server_descriptors.return_value = [ + RelayDescriptor.create({'platform': 'node-Tor 0.2.3.0 on Linux x86_64'}), + RelayDescriptor.create({'platform': 'node-Tor 0.1.0 on Linux x86_64'}), + RelayDescriptor.create({'opt': 'contact Random Person admin(a)gtr-10.de', 'platform': 'node-Tor 0.2.3.0 on Linux x86_64'}), + RelayDescriptor.create({'opt': 'contact Sambuddha Basu', 'platform': 'node-Tor 0.1.0 on Linux x86_64'}), + ] + + import outdated_relays + + self.assertEqual(EXPECTED_OUTDATED_RELAYS, stdout_mock.getvalue()) def test_persisting_a_consensus(self): pass diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index 4df9f6c4..0badb937 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -11,7 +11,6 @@ from unittest.mock import Mock, patch from stem.descriptor.networkstatus import NetworkStatusDocumentV3 from stem.descriptor.router_status_entry import RouterStatusEntryV3 -from stem.descriptor.server_descriptor import RelayDescriptor from stem.directory import DIRECTORY_AUTHORITIES from stem.response import ControlMessage @@ -25,14 +24,6 @@ PURPOSE=%s' PATH_CONTENT = '$%s=%s,$%s=%s,$%s=%s' -OUTDATED_RELAYS_OUTPUT = """\ -Checking for outdated relays... - - 0.1.0 Sambuddha Basu - -2 outdated relays found, 1 had contact information -""" - COMPARE_FLAGS_OUTPUT = """\ maatuska has the Running flag but moria1 doesn't: E2BB13AA2F6960CD93ABE5257A825687F3973C62 moria1 has the Running flag but maatuska doesn't: 546C54E2A89D88E0794D04AECBF1AC8AC9DA81DE @@ -87,20 +78,6 @@ def _get_router_status(address = None, port = None, nickname = None, fingerprint class TestTutorialExamples(unittest.TestCase): - @patch('sys.stdout', new_callable = io.StringIO) - @patch('stem.descriptor.remote.DescriptorDownloader') - def test_outdated_relays(self, downloader_mock, stdout_mock): - downloader_mock().get_server_descriptors.return_value = [ - RelayDescriptor.create({'platform': 'node-Tor 0.2.3.0 on Linux x86_64'}), - RelayDescriptor.create({'platform': 'node-Tor 0.1.0 on Linux x86_64'}), - RelayDescriptor.create({'opt': 'contact Random Person admin(a)gtr-10.de', 'platform': 'node-Tor 0.2.3.0 on Linux x86_64'}), - RelayDescriptor.create({'opt': 'contact Sambuddha Basu', 'platform': 'node-Tor 0.1.0 on Linux x86_64'}), - ] - - exec_documentation_example('outdated_relays.py') - - self.assertCountEqual(OUTDATED_RELAYS_OUTPUT.splitlines(), stdout_mock.getvalue().splitlines()) - @patch('sys.stdout', new_callable = io.StringIO) @patch('stem.descriptor.remote.Query') @patch('stem.directory.Authority.from_cache')

1 0

[stem/master] Move compare_flags test
by atagar＠torproject.org 03 Oct '20

03 Oct '20

commit ebdd4538f444cf8ee576d2a3969379c50179f7ca Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 27 14:47:18 2020 -0700 Move compare_flags test --- docs/_static/example/compare_flags.py | 2 +- test/unit/examples.py | 44 +++++++++++++++++++++++++++++-- test/unit/tutorial_examples.py | 49 ----------------------------------- 3 files changed, 43 insertions(+), 52 deletions(-) diff --git a/docs/_static/example/compare_flags.py b/docs/_static/example/compare_flags.py index 1efb1d2c..94c236e6 100644 --- a/docs/_static/example/compare_flags.py +++ b/docs/_static/example/compare_flags.py @@ -35,7 +35,7 @@ for vote in votes.values(): # Finally, compare moria1's votes to maatuska's votes. -for fingerprint in all_fingerprints: +for fingerprint in sorted(all_fingerprints): moria1_vote = votes['moria1'].routers.get(fingerprint) maatuska_vote = votes['maatuska'].routers.get(fingerprint) diff --git a/test/unit/examples.py b/test/unit/examples.py index 0fa140ab..8fca999a 100644 --- a/test/unit/examples.py +++ b/test/unit/examples.py @@ -18,8 +18,10 @@ import test.require from stem.control import Controller from stem.descriptor.bandwidth_file import BandwidthFile from stem.descriptor.extrainfo_descriptor import RelayExtraInfoDescriptor +from stem.descriptor.networkstatus import NetworkStatusDocumentV3 from stem.descriptor.router_status_entry import RouterStatusEntryV3 from stem.descriptor.server_descriptor import RelayDescriptor +from stem.directory import DIRECTORY_AUTHORITIES from stem.exit_policy import ExitPolicy from stem.response import ControlMessage from unittest.mock import Mock, patch @@ -105,6 +107,14 @@ EXPECTED_COLLECTOR_READING = """\ caerSidi (4F0C867DF0EF68160568C826838F482CEA7CFE44) """ +EXPECTED_COMPARE_FLAGS = """\ +moria1 has the Running flag but maatuska doesn't: 546C54E2A89D88E0794D04AECBF1AC8AC9DA81DE +maatuska has the Running flag but moria1 doesn't: 6871F682350BA931838C0EC1E4A23044DAE06A73 +maatuska has the Running flag but moria1 doesn't: 92FCB6748A40E6088E22FBAB943AB2DD743EA818 +moria1 has the Running flag but maatuska doesn't: DCAEC3D069DC39AAE43D13C8AF31B5645E05ED61 +maatuska has the Running flag but moria1 doesn't: E2BB13AA2F6960CD93ABE5257A825687F3973C62 +""" + EXPECTED_EXIT_USED = """\ Tracking requests for tor exits. Press 'enter' to end. @@ -321,8 +331,38 @@ class TestExamples(unittest.TestCase): self.assertEqual(EXPECTED_COLLECTOR_READING, stdout_mock.getvalue()) - def test_compare_flags(self): - pass + @patch('stem.directory.Authority.from_cache') + @patch('stem.descriptor.remote.Query') + @patch('sys.stdout', new_callable = io.StringIO) + def test_compare_flags(self, stdout_mock, query_mock, authorities_mock): + authorities_mock().items.return_value = [ + ('moria1', DIRECTORY_AUTHORITIES['moria1']), + ('maatuska', DIRECTORY_AUTHORITIES['maatuska']), + ] + + r_line = 'caerSidi %s oQZFLYe9e4A7bOkWKR7TaNxb0JE 2012-08-06 11:19:31 71.35.150.29 9001 0' + + moria1_consensus = NetworkStatusDocumentV3.create(routers = [ + RouterStatusEntryV3.create({'r': r_line % 'kvy2dIpA5giOIvurlDqy3XQ+qBg=', 's': ' '}), + RouterStatusEntryV3.create({'r': r_line % 'aHH2gjULqTGDjA7B5KIwRNrganM=', 's': ' '}), + RouterStatusEntryV3.create({'r': r_line % '4rsTqi9pYM2Tq+UleoJWh/OXPGI=', 's': ' '}), + RouterStatusEntryV3.create({'r': r_line % 'VGxU4qidiOB5TQSuy/Gsisnagd4='}), + RouterStatusEntryV3.create({'r': r_line % '3K7D0GncOarkPRPIrzG1ZF4F7WE='}), + ]) + + maatuska_consensus = NetworkStatusDocumentV3.create(routers = [ + RouterStatusEntryV3.create({'r': r_line % 'kvy2dIpA5giOIvurlDqy3XQ+qBg='}), + RouterStatusEntryV3.create({'r': r_line % 'aHH2gjULqTGDjA7B5KIwRNrganM='}), + RouterStatusEntryV3.create({'r': r_line % '4rsTqi9pYM2Tq+UleoJWh/OXPGI='}), + RouterStatusEntryV3.create({'r': r_line % 'VGxU4qidiOB5TQSuy/Gsisnagd4=', 's': ' '}), + RouterStatusEntryV3.create({'r': r_line % '3K7D0GncOarkPRPIrzG1ZF4F7WE=', 's': ' '}), + ]) + + query_mock().run.side_effect = [[moria1_consensus], [maatuska_consensus]] + + import compare_flags + + self.assertEqual(EXPECTED_COMPARE_FLAGS, stdout_mock.getvalue()) def test_create_descriptor(self): pass diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index 0badb937..ad9a68f4 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -24,14 +24,6 @@ PURPOSE=%s' PATH_CONTENT = '$%s=%s,$%s=%s,$%s=%s' -COMPARE_FLAGS_OUTPUT = """\ -maatuska has the Running flag but moria1 doesn't: E2BB13AA2F6960CD93ABE5257A825687F3973C62 -moria1 has the Running flag but maatuska doesn't: 546C54E2A89D88E0794D04AECBF1AC8AC9DA81DE -maatuska has the Running flag but moria1 doesn't: 92FCB6748A40E6088E22FBAB943AB2DD743EA818 -maatuska has the Running flag but moria1 doesn't: 6871F682350BA931838C0EC1E4A23044DAE06A73 -moria1 has the Running flag but maatuska doesn't: DCAEC3D069DC39AAE43D13C8AF31B5645E05ED61 -""" - VOTES_BY_BANDWIDTH_AUTHORITIES_OUTPUT = """\ Getting gabelmoo's vote from http://131.188.40.189:80/tor/status-vote/current/authority: 5935 measured entries and 1332 unmeasured @@ -78,47 +70,6 @@ def _get_router_status(address = None, port = None, nickname = None, fingerprint class TestTutorialExamples(unittest.TestCase): - @patch('sys.stdout', new_callable = io.StringIO) - @patch('stem.descriptor.remote.Query') - @patch('stem.directory.Authority.from_cache') - def test_compare_flags(self, authorities_mock, query_mock, stdout_mock): - authorities_mock().items.return_value = [('moria1', DIRECTORY_AUTHORITIES['moria1']), ('maatuska', DIRECTORY_AUTHORITIES['maatuska'])] - - fingerprint = [ - ('92FCB6748A40E6088E22FBAB943AB2DD743EA818', 'kvy2dIpA5giOIvurlDqy3XQ+qBg='), - ('6871F682350BA931838C0EC1E4A23044DAE06A73', 'aHH2gjULqTGDjA7B5KIwRNrganM='), - ('E2BB13AA2F6960CD93ABE5257A825687F3973C62', '4rsTqi9pYM2Tq+UleoJWh/OXPGI='), - ('546C54E2A89D88E0794D04AECBF1AC8AC9DA81DE', 'VGxU4qidiOB5TQSuy/Gsisnagd4='), - ('DCAEC3D069DC39AAE43D13C8AF31B5645E05ED61', '3K7D0GncOarkPRPIrzG1ZF4F7WE='), - ] - - entry = [ - # entries for moria1 - - _get_router_status(fingerprint_base64 = fingerprint[0][1], s_line = ' '), - _get_router_status(fingerprint_base64 = fingerprint[1][1], s_line = ' '), - _get_router_status(fingerprint_base64 = fingerprint[2][1], s_line = ' '), - _get_router_status(fingerprint_base64 = fingerprint[3][1]), - _get_router_status(fingerprint_base64 = fingerprint[4][1]), - - # entries for maatuska - - _get_router_status(fingerprint_base64 = fingerprint[0][1]), - _get_router_status(fingerprint_base64 = fingerprint[1][1]), - _get_router_status(fingerprint_base64 = fingerprint[2][1]), - _get_router_status(fingerprint_base64 = fingerprint[3][1], s_line = ' '), - _get_router_status(fingerprint_base64 = fingerprint[4][1], s_line = ' '), - ] - - query_mock().run.side_effect = [ - [NetworkStatusDocumentV3.create(routers = (entry[0], entry[1], entry[2], entry[3], entry[4]))], - [NetworkStatusDocumentV3.create(routers = (entry[5], entry[6], entry[7], entry[8], entry[9]))], - ] - - exec_documentation_example('compare_flags.py') - - self.assertCountEqual(COMPARE_FLAGS_OUTPUT.splitlines(), stdout_mock.getvalue().splitlines()) - @patch('sys.stdout', new_callable = io.StringIO) @patch('stem.directory.Authority.from_cache') @patch('stem.descriptor.remote.DescriptorDownloader.query')

1 0

[stem/master] Move hello_world test
by atagar＠torproject.org 03 Oct '20

03 Oct '20

commit 21ce92eda4855e8091b163713e8f8ed00b4181ef Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 27 16:06:45 2020 -0700 Move hello_world test --- test/unit/examples.py | 14 ++++++++++++-- test/unit/tutorial.py | 12 ------------ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/test/unit/examples.py b/test/unit/examples.py index 3f528b80..9250280e 100644 --- a/test/unit/examples.py +++ b/test/unit/examples.py @@ -438,8 +438,18 @@ class TestExamples(unittest.TestCase): def test_get_hidden_service_descriptor(self): pass - def test_hello_world(self): - pass + @patch('stem.control.Controller.from_port', spec = Controller) + @patch('sys.stdout', new_callable = io.StringIO) + def test_hello_world(self, stdout_mock, from_port_mock): + controller = from_port_mock().__enter__() + controller.get_info.side_effect = lambda arg: { + 'traffic/read': '33406', + 'traffic/written': '29649', + }[arg] + + import hello_world + + self.assertEqual('My Tor relay has read 33406 bytes and written 29649.\n', stdout_mock.getvalue()) def test_introduction_points(self): pass diff --git a/test/unit/tutorial.py b/test/unit/tutorial.py index 140bbba5..92793afe 100644 --- a/test/unit/tutorial.py +++ b/test/unit/tutorial.py @@ -46,18 +46,6 @@ class TestTutorial(unittest.TestCase): stem.descriptor.remote.SINGLETON_DOWNLOADER = None - @patch('sys.stdout', new_callable = io.StringIO) - @patch('stem.control.Controller.from_port', spec = Controller) - def test_the_little_relay_that_could(self, from_port_mock, stdout_mock): - controller = from_port_mock().__enter__() - controller.get_info.side_effect = lambda arg: { - 'traffic/read': '33406', - 'traffic/written': '29649', - }[arg] - - exec_documentation_example('hello_world.py') - self.assertEqual('My Tor relay has read 33406 bytes and written 29649.\n', stdout_mock.getvalue()) - @patch('sys.stdout', new_callable = io.StringIO) @patch('shutil.rmtree') @patch('stem.control.Controller.from_port', spec = Controller)

1 0

[stem/master] Move votes_by_bandwidth_authorities test
by atagar＠torproject.org 03 Oct '20

03 Oct '20

commit 2719fd3c44e8623f07094687146839aed0285e63 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 27 14:55:07 2020 -0700 Move votes_by_bandwidth_authorities test --- test/unit/examples.py | 41 ++++++++++++++++++++++++++++++++++++-- test/unit/tutorial_examples.py | 45 +----------------------------------------- 2 files changed, 40 insertions(+), 46 deletions(-) diff --git a/test/unit/examples.py b/test/unit/examples.py index 8fca999a..1b055628 100644 --- a/test/unit/examples.py +++ b/test/unit/examples.py @@ -152,6 +152,15 @@ Checking for outdated relays... 2 outdated relays found, 1 had contact information """ +EXPECTED_VOTES_BY_BANDWIDTH_AUTHORITIES = """\ +Getting gabelmoo's vote from http://131.188.40.189:80/tor/status-vote/current/authority: + 5935 measured entries and 1332 unmeasured +Getting moria1's vote from http://128.31.0.39:9131/tor/status-vote/current/authority: + 6647 measured entries and 625 unmeasured +Getting maatuska's vote from http://171.25.193.9:443/tor/status-vote/current/authority: + 6313 measured entries and 1112 unmeasured +""" + def _make_circ_event(circ_id, hop1, hop2, hop3): path = '$%s=%s,$%s=%s,$%s=%s' % (hop1[0], hop1[1], hop2[0], hop2[1], hop3[0], hop3[1]) @@ -524,8 +533,36 @@ class TestExamples(unittest.TestCase): def test_validate_descriptor_content(self): pass - def test_votes_by_bandwidth_authorities(self): - pass + @patch('stem.descriptor.remote.DescriptorDownloader.query') + @patch('stem.directory.Authority.from_cache') + @patch('sys.stdout', new_callable = io.StringIO) + def test_votes_by_bandwidth_authorities(self, stdout_mock, authorities_mock, query_mock): + authorities_mock().values.return_value = [ + DIRECTORY_AUTHORITIES['gabelmoo'], + DIRECTORY_AUTHORITIES['moria1'], + DIRECTORY_AUTHORITIES['maatuska'], + ] + + entry_with_measurement = RouterStatusEntryV3.create({'w': 'Bandwidth=1 Measured=1'}) + entry_without_measurement = RouterStatusEntryV3.create() + + query1 = Mock() + query1.download_url = 'http://131.188.40.189:80/tor/status-vote/current/authority' + query1.run.return_value = [entry_with_measurement] * 5935 + [entry_without_measurement] * 1332 + + query2 = Mock() + query2.download_url = 'http://128.31.0.39:9131/tor/status-vote/current/authority' + query2.run.return_value = [entry_with_measurement] * 6647 + [entry_without_measurement] * 625 + + query3 = Mock() + query3.download_url = 'http://171.25.193.9:443/tor/status-vote/current/authority' + query3.run.return_value = [entry_with_measurement] * 6313 + [entry_without_measurement] * 1112 + + query_mock.side_effect = [query1, query2, query3] + + import votes_by_bandwidth_authorities + + self.assertEqual(EXPECTED_VOTES_BY_BANDWIDTH_AUTHORITIES, stdout_mock.getvalue()) def test_words_with(self): pass diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index ad9a68f4..451bb2aa 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -7,11 +7,10 @@ import itertools import os import unittest -from unittest.mock import Mock, patch +from unittest.mock import patch from stem.descriptor.networkstatus import NetworkStatusDocumentV3 from stem.descriptor.router_status_entry import RouterStatusEntryV3 -from stem.directory import DIRECTORY_AUTHORITIES from stem.response import ControlMessage from test.unit import exec_documentation_example @@ -24,15 +23,6 @@ PURPOSE=%s' PATH_CONTENT = '$%s=%s,$%s=%s,$%s=%s' -VOTES_BY_BANDWIDTH_AUTHORITIES_OUTPUT = """\ -Getting gabelmoo's vote from http://131.188.40.189:80/tor/status-vote/current/authority: - 5935 measured entries and 1332 unmeasured -Getting moria1's vote from http://128.31.0.39:9131/tor/status-vote/current/authority: - 6647 measured entries and 625 unmeasured -Getting maatuska's vote from http://171.25.193.9:443/tor/status-vote/current/authority: - 6313 measured entries and 1112 unmeasured -""" - PERSISTING_A_CONSENSUS_OUTPUT = """\ A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB: caerSidi """ @@ -70,39 +60,6 @@ def _get_router_status(address = None, port = None, nickname = None, fingerprint class TestTutorialExamples(unittest.TestCase): - @patch('sys.stdout', new_callable = io.StringIO) - @patch('stem.directory.Authority.from_cache') - @patch('stem.descriptor.remote.DescriptorDownloader.query') - def test_votes_by_bandwidth_authorities(self, query_mock, authorities_mock, stdout_mock): - directory_values = [ - DIRECTORY_AUTHORITIES['gabelmoo'], - DIRECTORY_AUTHORITIES['moria1'], - DIRECTORY_AUTHORITIES['maatuska'], - ] - - directory_values[0].address = '131.188.40.189' - authorities_mock().values.return_value = directory_values - - entry_with_measurement = RouterStatusEntryV3.create({'w': 'Bandwidth=1 Measured=1'}) - entry_without_measurement = RouterStatusEntryV3.create() - - query1 = Mock() - query1.download_url = 'http://131.188.40.189:80/tor/status-vote/current/authority' - query1.run.return_value = [entry_with_measurement] * 5935 + [entry_without_measurement] * 1332 - - query2 = Mock() - query2.download_url = 'http://128.31.0.39:9131/tor/status-vote/current/authority' - query2.run.return_value = [entry_with_measurement] * 6647 + [entry_without_measurement] * 625 - - query3 = Mock() - query3.download_url = 'http://171.25.193.9:443/tor/status-vote/current/authority' - query3.run.return_value = [entry_with_measurement] * 6313 + [entry_without_measurement] * 1112 - - query_mock.side_effect = [query1, query2, query3] - - exec_documentation_example('votes_by_bandwidth_authorities.py') - self.assertCountEqual(VOTES_BY_BANDWIDTH_AUTHORITIES_OUTPUT.splitlines(), stdout_mock.getvalue().splitlines()) - @patch('sys.stdout', new_callable = io.StringIO) @patch('stem.descriptor.parse_file') @patch('stem.descriptor.remote.Query')

1 0

[stem/master] Move current_descriptors test
by atagar＠torproject.org 03 Oct '20

03 Oct '20

commit b2cf76cb0cc69e16dfd34eec618262e4ac227f15 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 27 16:08:49 2020 -0700 Move current_descriptors test --- test/unit/examples.py | 14 +++++++++++--- test/unit/tutorial.py | 10 ---------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/test/unit/examples.py b/test/unit/examples.py index 9250280e..a117bb24 100644 --- a/test/unit/examples.py +++ b/test/unit/examples.py @@ -19,7 +19,7 @@ from stem.control import Controller from stem.descriptor.bandwidth_file import BandwidthFile from stem.descriptor.extrainfo_descriptor import RelayExtraInfoDescriptor from stem.descriptor.networkstatus import NetworkStatusDocumentV3 -from stem.descriptor.router_status_entry import RouterStatusEntryV3 +from stem.descriptor.router_status_entry import RouterStatusEntryV2, RouterStatusEntryV3 from stem.descriptor.server_descriptor import RelayDescriptor from stem.directory import DIRECTORY_AUTHORITIES from stem.exit_policy import ExitPolicy @@ -383,8 +383,16 @@ class TestExamples(unittest.TestCase): def test_create_descriptor_content(self): pass - def test_current_descriptors(self): - pass + @patch('stem.descriptor.remote.DescriptorDownloader') + @patch('sys.stdout', new_callable = io.StringIO) + def test_current_descriptors(self, stdout_mock, downloader_mock): + downloader_mock().get_consensus.return_value = [RouterStatusEntryV2.create({ + 'r': 'caerSidi p1aag7VwarGxqctS7/fS0y5FU+s oQZFLYe9e4A7bOkWKR7TaNxb0JE 2012-08-06 11:19:31 71.35.150.29 9001 0', + })] + + import current_descriptors + + self.assertEqual('found relay caerSidi (A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB)\n', stdout_mock.getvalue()) def test_custom_path_selection(self): pass diff --git a/test/unit/tutorial.py b/test/unit/tutorial.py index 92793afe..90dfc661 100644 --- a/test/unit/tutorial.py +++ b/test/unit/tutorial.py @@ -112,16 +112,6 @@ class TestTutorial(unittest.TestCase): self.assertEqual(OVER_THE_RIVER_OUTPUT, stdout_mock.getvalue()) - @patch('sys.stdout', new_callable = io.StringIO) - @patch('stem.descriptor.remote.DescriptorDownloader') - def test_mirror_mirror_on_the_wall_1(self, downloader_mock, stdout_mock): - downloader_mock().get_consensus.return_value = [RouterStatusEntryV2.create({ - 'r': 'caerSidi p1aag7VwarGxqctS7/fS0y5FU+s oQZFLYe9e4A7bOkWKR7TaNxb0JE 2012-08-06 11:19:31 71.35.150.29 9001 0', - })] - - exec_documentation_example('current_descriptors.py') - self.assertEqual('found relay caerSidi (A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB)\n', stdout_mock.getvalue()) - @patch('sys.stdout', new_callable = io.StringIO) @patch('stem.control.Controller.from_port', spec = Controller) def test_mirror_mirror_on_the_wall_2(self, from_port_mock, stdout_mock):

1 0

[stem/master] Move descriptor_from_tor_control_socket test
by atagar＠torproject.org 03 Oct '20

03 Oct '20

commit 21725bd2f4efcb16f5300b2a9370a8817226a0d3 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 27 16:11:42 2020 -0700 Move descriptor_from_tor_control_socket test --- test/unit/examples.py | 13 +++++++++++-- test/unit/tutorial.py | 13 +------------ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/test/unit/examples.py b/test/unit/examples.py index a117bb24..5b56261e 100644 --- a/test/unit/examples.py +++ b/test/unit/examples.py @@ -400,8 +400,17 @@ class TestExamples(unittest.TestCase): def test_descriptor_from_orport(self): pass - def test_descriptor_from_tor_control_socket(self): - pass + @patch('stem.control.Controller.from_port', spec = Controller) + @patch('sys.stdout', new_callable = io.StringIO) + def test_descriptor_from_tor_control_socket(self, stdout_mock, from_port_mock): + controller = from_port_mock().__enter__() + controller.get_network_statuses.return_value = [RouterStatusEntryV2.create({ + 'r': 'caerSidi p1aag7VwarGxqctS7/fS0y5FU+s oQZFLYe9e4A7bOkWKR7TaNxb0JE 2012-08-06 11:19:31 71.35.150.29 9001 0', + })] + + import descriptor_from_tor_control_socket + + self.assertEqual('found relay caerSidi (A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB)\n', stdout_mock.getvalue()) def test_descriptor_from_tor_data_directory(self): pass diff --git a/test/unit/tutorial.py b/test/unit/tutorial.py index 90dfc661..d1093bd5 100644 --- a/test/unit/tutorial.py +++ b/test/unit/tutorial.py @@ -12,7 +12,7 @@ import test from unittest.mock import Mock, patch from stem.control import Controller -from stem.descriptor.router_status_entry import RouterStatusEntryV2, RouterStatusEntryV3 +from stem.descriptor.router_status_entry import RouterStatusEntryV3 from stem.descriptor.networkstatus import NetworkStatusDocumentV3 from stem.descriptor.server_descriptor import RelayDescriptor from stem.exit_policy import ExitPolicy @@ -112,17 +112,6 @@ class TestTutorial(unittest.TestCase): self.assertEqual(OVER_THE_RIVER_OUTPUT, stdout_mock.getvalue()) - @patch('sys.stdout', new_callable = io.StringIO) - @patch('stem.control.Controller.from_port', spec = Controller) - def test_mirror_mirror_on_the_wall_2(self, from_port_mock, stdout_mock): - controller = from_port_mock().__enter__() - controller.get_network_statuses.return_value = [RouterStatusEntryV2.create({ - 'r': 'caerSidi p1aag7VwarGxqctS7/fS0y5FU+s oQZFLYe9e4A7bOkWKR7TaNxb0JE 2012-08-06 11:19:31 71.35.150.29 9001 0', - })] - - exec_documentation_example('descriptor_from_tor_control_socket.py') - self.assertEqual('found relay caerSidi (A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB)\n', stdout_mock.getvalue()) - @patch('sys.stdout', new_callable = io.StringIO) @patch('%s.open' % __name__, create = True) def test_mirror_mirror_on_the_wall_3(self, open_mock, stdout_mock):

1 0