- tor-commits - lists.torproject.org

[stem/master] Add test cases for CLIENTS_SEEN event
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit df01f3737143545493652437680db52ea8e7f337 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 15:20:13 2012 -0700 Add test cases for CLIENTS_SEEN event These sample events hit every exception possible in the ClientsSeenEvent _parse() method. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/response/events.py | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 100d357..48aab32 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -125,6 +125,36 @@ TimeStarted="2008-12-25 23:50:43" \ CountrySummary=us=16,de=8,uk=8 \ IPVersions=v4=16,v6=40' +CLIENTS_SEEN_EVENT_BAD_1 = '650 CLIENTS_SEEN \ +TimeStarted="2008-12-25 23:50:43" \ +CountrySummary=us:16,de:8,uk:8 \ +IPVersions=v4=16,v6=40' + +CLIENTS_SEEN_EVENT_BAD_2 = '650 CLIENTS_SEEN \ +TimeStarted="2008-12-25 23:50:43" \ +CountrySummary=usa=16,unitedkingdom=8 \ +IPVersions=v4=16,v6=40' + +CLIENTS_SEEN_EVENT_BAD_3 = '650 CLIENTS_SEEN \ +TimeStarted="2008-12-25 23:50:43" \ +CountrySummary=us=16,de=8,uk=eight \ +IPVersions=v4=16,v6=40' + +CLIENTS_SEEN_EVENT_BAD_4 = '650 CLIENTS_SEEN \ +TimeStarted="2008-12-25 23:50:43" \ +CountrySummary=au=16,au=8,au=8 \ +IPVersions=v4=16,v6=40' + +CLIENTS_SEEN_EVENT_BAD_5 = '650 CLIENTS_SEEN \ +TimeStarted="2008-12-25 23:50:43" \ +CountrySummary=us=16,de=8,uk=8 \ +IPVersions=v4:16,v6:40' + +CLIENTS_SEEN_EVENT_BAD_6 = '650 CLIENTS_SEEN \ +TimeStarted="2008-12-25 23:50:43" \ +CountrySummary=us=16,de=8,uk=8 \ +IPVersions=v4=sixteen,v6=40' + # CONF_CHANGED event from tor 0.2.3.16. CONF_CHANGED_EVENT = """650-CONF_CHANGED @@ -512,6 +542,13 @@ class TestEvents(unittest.TestCase): self.assertEqual(datetime.datetime(2008, 12, 25, 23, 50, 43), event.start_time) self.assertEqual({'us': 16, 'de': 8, 'uk': 8}, event.locales) self.assertEqual({'v4': 16, 'v6': 40}, event.ip_versions) + + self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_1) + self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_2) + self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_3) + self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_4) + self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_5) + self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_6) def test_conf_changed(self): event = _get_event(CONF_CHANGED_EVENT)

1 0

[stem/master] Add test cases for CIRC events
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit c5db5cb1be07da0da92b30559557e72285d3fc37 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 15:00:49 2012 -0700 Add test cases for CIRC events Check ProtocolError is raised when the TIME_CREATED time cannot be parsed or the CiruitID is not valid. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/response/events.py | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 18ce4bd..47f4567 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -63,6 +63,16 @@ BUILD_FLAGS=NEED_CAPACITY \ PURPOSE=GENERAL \ TIME_CREATED=2012-11-08T16:48:38.417238" +CIRC_LAUNCHED_BAD_1 = "650 CIRC 7 LAUNCHED \ +BUILD_FLAGS=NEED_CAPACITY \ +PURPOSE=GENERAL \ +TIME_CREATED=20121108T164838417238" + +CIRC_LAUNCHED_BAD_2 = "650 CIRC toolong8901234567 LAUNCHED \ +BUILD_FLAGS=NEED_CAPACITY \ +PURPOSE=GENERAL \ +TIME_CREATED=2012-11-08T16:48:38.417238" + CIRC_EXTENDED = "650 CIRC 7 EXTENDED \ $999A226EBED397F331B612FE1E4CFAE5C1F201BA=piyaz \ BUILD_FLAGS=NEED_CAPACITY \ @@ -383,6 +393,9 @@ class TestEvents(unittest.TestCase): self.assertEqual(None, event.reason) self.assertEqual(None, event.remote_reason) + self.assertRaises(ProtocolError, _get_event, CIRC_LAUNCHED_BAD_1) + self.assertRaises(ProtocolError, _get_event, CIRC_LAUNCHED_BAD_2) + event = _get_event(CIRC_EXTENDED) self.assertTrue(isinstance(event, stem.response.events.CircuitEvent))

1 0

[stem/master] Add test cases for CIRC_MINOR events
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit 6cf5422575dd1e3e6fe2237d6bbc2f45e2096e1a Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 15:09:00 2012 -0700 Add test cases for CIRC_MINOR events Checks the same error conditions added to CIRC event tests in previous commit. Also, swap test_circ_minor_event() and test_clients_seen_event() to alphabetic order of appearance. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/response/events.py | 35 ++++++++++++++++++++++++++--------- 1 files changed, 26 insertions(+), 9 deletions(-) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 47f4567..100d357 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -104,6 +104,20 @@ PURPOSE=MEASURE_TIMEOUT \ TIME_CREATED=2012-12-03T16:45:33.409602 \ OLD_PURPOSE=TESTING" +CIRC_MINOR_EVENT_BAD_1 = "650 CIRC_MINOR 7 PURPOSE_CHANGED \ +$67B2BDA4264D8A189D9270E28B1D30A262838243~europa1 \ +BUILD_FLAGS=IS_INTERNAL,NEED_CAPACITY \ +PURPOSE=MEASURE_TIMEOUT \ +TIME_CREATED=20121203T164533409602 \ +OLD_PURPOSE=TESTING" + +CIRC_MINOR_EVENT_BAD_2 = "650 CIRC_MINOR toolong8901234567 PURPOSE_CHANGED \ +$67B2BDA4264D8A189D9270E28B1D30A262838243~europa1 \ +BUILD_FLAGS=IS_INTERNAL,NEED_CAPACITY \ +PURPOSE=MEASURE_TIMEOUT \ +TIME_CREATED=2012-12-03T16:45:33.409602 \ +OLD_PURPOSE=TESTING" + # CLIENTS_SEEN example from the spec CLIENTS_SEEN_EVENT = '650 CLIENTS_SEEN \ @@ -471,15 +485,6 @@ class TestEvents(unittest.TestCase): self.assertEqual(None, event.reason) self.assertEqual(None, event.remote_reason) - def test_clients_seen_event(self): - event = _get_event(CLIENTS_SEEN_EVENT) - - self.assertTrue(isinstance(event, stem.response.events.ClientsSeenEvent)) - self.assertEqual(CLIENTS_SEEN_EVENT.lstrip("650 "), str(event)) - self.assertEqual(datetime.datetime(2008, 12, 25, 23, 50, 43), event.start_time) - self.assertEqual({'us': 16, 'de': 8, 'uk': 8}, event.locales) - self.assertEqual({'v4': 16, 'v6': 40}, event.ip_versions) - def test_circ_minor_event(self): event = _get_event(CIRC_MINOR_EVENT) @@ -495,6 +500,18 @@ class TestEvents(unittest.TestCase): self.assertEqual(datetime.datetime(2012, 12, 3, 16, 45, 33, 409602), event.created) self.assertEqual(CircPurpose.TESTING, event.old_purpose) self.assertEqual(None, event.old_hs_state) + + self.assertRaises(ProtocolError, _get_event, CIRC_MINOR_EVENT_BAD_1) + self.assertRaises(ProtocolError, _get_event, CIRC_MINOR_EVENT_BAD_2) + + def test_clients_seen_event(self): + event = _get_event(CLIENTS_SEEN_EVENT) + + self.assertTrue(isinstance(event, stem.response.events.ClientsSeenEvent)) + self.assertEqual(CLIENTS_SEEN_EVENT.lstrip("650 "), str(event)) + self.assertEqual(datetime.datetime(2008, 12, 25, 23, 50, 43), event.start_time) + self.assertEqual({'us': 16, 'de': 8, 'uk': 8}, event.locales) + self.assertEqual({'v4': 16, 'v6': 40}, event.ip_versions) def test_conf_changed(self): event = _get_event(CONF_CHANGED_EVENT)

1 0

[stem/master] Change status event type for CONSENSUS_ARRIVED
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit 146f32473a3c0f9f91c0e4a721e92906d293a63e Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 16:11:37 2012 -0700 Change status event type for CONSENSUS_ARRIVED According to control-spec.txt, CONSENSUS_ARRIVED is in the STATUS_GENERAL family. While it is not vital for the faked test events, let's make it accurate. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/response/events.py | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index db33367..21b5fa5 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -211,7 +211,8 @@ CONNECTED NCIRCS=too_many" # STATUS_* events that I was able to easily trigger. Most came from starting # TBB, then listening while it bootstrapped. -STATUS_CLIENT_CONSENSUS_ARRIVED = "650 STATUS_CLIENT NOTICE CONSENSUS_ARRIVED" +STATUS_GENERAL_CONSENSUS_ARRIVED = "650 STATUS_GENERAL NOTICE CONSENSUS_ARRIVED" + STATUS_CLIENT_ENOUGH_DIR_INFO = "650 STATUS_CLIENT NOTICE ENOUGH_DIR_INFO" STATUS_CLIENT_CIRC_ESTABLISHED = "650 STATUS_CLIENT NOTICE CIRCUIT_ESTABLISHED" @@ -704,11 +705,11 @@ class TestEvents(unittest.TestCase): self.assertEqual(Signal.DUMP, event.signal) def test_status_event_consensus_arrived(self): - event = _get_event(STATUS_CLIENT_CONSENSUS_ARRIVED) + event = _get_event(STATUS_GENERAL_CONSENSUS_ARRIVED) self.assertTrue(isinstance(event, stem.response.events.StatusEvent)) - self.assertEqual(STATUS_CLIENT_CONSENSUS_ARRIVED.lstrip("650 "), str(event)) - self.assertEqual(StatusType.CLIENT, event.status_type) + self.assertEqual(STATUS_GENERAL_CONSENSUS_ARRIVED.lstrip("650 "), str(event)) + self.assertEqual(StatusType.GENERAL, event.status_type) self.assertEqual(Runlevel.NOTICE, event.runlevel) self.assertEqual("CONSENSUS_ARRIVED", event.action) @@ -1048,17 +1049,17 @@ class TestEvents(unittest.TestCase): # Try parsing a valid event. We shouldn't log anything. - _get_event(STATUS_CLIENT_CONSENSUS_ARRIVED) + _get_event(STATUS_GENERAL_CONSENSUS_ARRIVED) self.assertTrue(logging_buffer.is_empty()) self.assertEqual([], list(logging_buffer)) # Parse an invalid runlevel. - _get_event(STATUS_CLIENT_CONSENSUS_ARRIVED.replace("NOTICE", "OMEGA_CRITICAL!!!")) + _get_event(STATUS_GENERAL_CONSENSUS_ARRIVED.replace("NOTICE", "OMEGA_CRITICAL!!!")) logged_events = list(logging_buffer) self.assertEqual(1, len(logged_events)) - self.assertTrue("STATUS_CLIENT event had an unrecognized runlevel" in logged_events[0]) + self.assertTrue("STATUS_GENERAL event had an unrecognized runlevel" in logged_events[0]) stem_logger.removeHandler(logging_buffer)

1 0

[stem/master] Add test cases for ORCONN events
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit 04633d4243f88f232a39daf5cbffbb228ee8f6bf Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 15:44:35 2012 -0700 Add test cases for ORCONN events Rename ORCONN_CONNECTED to ORCONN_LAUNCHED and use ORCONN_CONNECTED for more complex _parse() method test. Adds three bad events to trigger exceptions in _parse(). Move sample lines to alphabetic position among other sample cases. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/response/events.py | 66 ++++++++++++++++++++++++++++++----------- 1 files changed, 48 insertions(+), 18 deletions(-) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 48aab32..db33367 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -190,6 +190,24 @@ s Fast HSDir Named Stable V2Dir Valid 650 OK """ +# ORCONN events from starting tor 0.2.2.39 via TBB + +ORCONN_CLOSED = "650 ORCONN $A1130635A0CDA6F60C276FBF6994EFBD4ECADAB1~tama CLOSED REASON=DONE" +ORCONN_CONNECTED = "650 ORCONN 127.0.0.1:9000 CONNECTED NCIRCS=20" +ORCONN_LAUNCHED = "650 ORCONN $7ED90E2833EE38A75795BA9237B0A4560E51E1A0=GreenDragon LAUNCHED" + +ORCONN_CONNECTED_BAD_1 = "650 ORCONN \ +$7ED90E2833EE38A75795BA9237B0A4560E5=GreenD \ +LAUNCHED" + +ORCONN_CONNECTED_BAD_2 = "650 ORCONN \ +127.0.0.1:001 \ +CONNECTED" + +ORCONN_CONNECTED_BAD_3 = "650 ORCONN \ +127.0.0.1:9000 \ +CONNECTED NCIRCS=too_many" + # STATUS_* events that I was able to easily trigger. Most came from starting # TBB, then listening while it bootstrapped. @@ -266,11 +284,6 @@ STREAM_DNS_REQUEST = "650 STREAM 1113 NEW 0 www.google.com:0 \ SOURCE_ADDR=127.0.0.1:15297 \ PURPOSE=DNS_REQUEST" -# ORCONN events from starting tor 0.2.2.39 via TBB - -ORCONN_CONNECTED = "650 ORCONN $7ED90E2833EE38A75795BA9237B0A4560E51E1A0=GreenDragon CONNECTED" -ORCONN_CLOSED = "650 ORCONN $A1130635A0CDA6F60C276FBF6994EFBD4ECADAB1~tama CLOSED REASON=DONE" - # NEWDESC events. I've never actually seen multiple descriptors in an event, # but the spec allows for it. @@ -638,19 +651,6 @@ class TestEvents(unittest.TestCase): self.assertEqual([expected_desc], event.desc) def test_orconn_event(self): - event = _get_event(ORCONN_CONNECTED) - - self.assertTrue(isinstance(event, stem.response.events.ORConnEvent)) - self.assertEqual(ORCONN_CONNECTED.lstrip("650 "), str(event)) - self.assertEqual("$7ED90E2833EE38A75795BA9237B0A4560E51E1A0=GreenDragon", event.endpoint) - self.assertEqual("7ED90E2833EE38A75795BA9237B0A4560E51E1A0", event.endpoint_fingerprint) - self.assertEqual("GreenDragon", event.endpoint_nickname) - self.assertEqual(None, event.endpoint_address) - self.assertEqual(None, event.endpoint_port) - self.assertEqual(ORStatus.CONNECTED, event.status) - self.assertEqual(None, event.reason) - self.assertEqual(None, event.circ_count) - event = _get_event(ORCONN_CLOSED) self.assertTrue(isinstance(event, stem.response.events.ORConnEvent)) @@ -663,6 +663,36 @@ class TestEvents(unittest.TestCase): self.assertEqual(ORStatus.CLOSED, event.status) self.assertEqual(ORClosureReason.DONE, event.reason) self.assertEqual(None, event.circ_count) + + event = _get_event(ORCONN_CONNECTED) + + self.assertTrue(isinstance(event, stem.response.events.ORConnEvent)) + self.assertEqual(ORCONN_CONNECTED.lstrip("650 "), str(event)) + self.assertEqual("127.0.0.1:9000", event.endpoint) + self.assertEqual(None, event.endpoint_fingerprint) + self.assertEqual(None, event.endpoint_nickname) + self.assertEqual('127.0.0.1', event.endpoint_address) + self.assertEqual(9000, event.endpoint_port) + self.assertEqual(ORStatus.CONNECTED, event.status) + self.assertEqual(None, event.reason) + self.assertEqual(20, event.circ_count) + + event = _get_event(ORCONN_LAUNCHED) + + self.assertTrue(isinstance(event, stem.response.events.ORConnEvent)) + self.assertEqual(ORCONN_LAUNCHED.lstrip("650 "), str(event)) + self.assertEqual("$7ED90E2833EE38A75795BA9237B0A4560E51E1A0=GreenDragon", event.endpoint) + self.assertEqual("7ED90E2833EE38A75795BA9237B0A4560E51E1A0", event.endpoint_fingerprint) + self.assertEqual("GreenDragon", event.endpoint_nickname) + self.assertEqual(None, event.endpoint_address) + self.assertEqual(None, event.endpoint_port) + self.assertEqual(ORStatus.LAUNCHED, event.status) + self.assertEqual(None, event.reason) + self.assertEqual(None, event.circ_count) + + self.assertRaises(ProtocolError, _get_event, ORCONN_CONNECTED_BAD_1) + self.assertRaises(ProtocolError, _get_event, ORCONN_CONNECTED_BAD_2) + self.assertRaises(ProtocolError, _get_event, ORCONN_CONNECTED_BAD_3) def test_signal_event(self): event = _get_event("650 SIGNAL DEBUG")

1 0

[stem/master] Add test case for invalid STATUS_* event type
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit 58c48067ba1b901bdb1d4151181949591c97b60a Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 16:12:28 2012 -0700 Add test case for invalid STATUS_* event type Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/response/events.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 21b5fa5..a632125 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -264,6 +264,9 @@ STATUS_SERVER_DNS_UP = "650 STATUS_SERVER NOTICE NAMESERVER_STATUS \ NS=205.171.3.25 \ STATUS=UP" +# unknown STATUS_* event type +STATUS_SPECIFIC_CONSENSUS_ARRIVED = "650 STATUS_SPECIFIC NOTICE CONSENSUS_ARRIVED" + # STREAM events from tor 0.2.3.16 for visiting the google front page STREAM_NEW = "650 STREAM 18 NEW 0 \ @@ -870,6 +873,12 @@ class TestEvents(unittest.TestCase): self.assertEqual(expected_attr, event.keyword_args) + def test_status_event_bug(self): + # briefly insert a fake value in EVENT_TYPE_TO_CLASS + stem.response.events.EVENT_TYPE_TO_CLASS['STATUS_SPECIFIC'] = stem.response.events.StatusEvent + self.assertRaises(ValueError, _get_event, STATUS_SPECIFIC_CONSENSUS_ARRIVED) + del stem.response.events.EVENT_TYPE_TO_CLASS['STATUS_SPECIFIC'] + def test_stream_event(self): event = _get_event(STREAM_NEW)

1 0

[stem/master] FIX: include positional argument name which is missing proper quoting
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit 8a0c9f58046670c7a808e2e4a79b82244405e847 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 14:05:13 2012 -0700 FIX: include positional argument name which is missing proper quoting This was discovered with a spot coverage test. These were the only lines not run in the Event class while I was adding tests for the stem.response.events module. I just *had* to write a test for these two lines and it turned out they had a problem. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- stem/response/events.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stem/response/events.py b/stem/response/events.py index 4e0aef8..889f93b 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -96,11 +96,11 @@ class Event(stem.response.ControlMessage): attr_values = [positional.pop(0)] if not attr_values[0].startswith('"'): - raise stem.ProtocolError("The %s value should be quoted, but didn't have a starting quote: %s" % self) + raise stem.ProtocolError("The %s value should be quoted, but didn't have a starting quote: %s" % (attr_name, self)) while True: if not positional: - raise stem.ProtocolError("The %s value should be quoted, but didn't have an ending quote: %s" % self) + raise stem.ProtocolError("The %s value should be quoted, but didn't have an ending quote: %s" % (attr_name, self)) attr_values.append(positional.pop(0)) if attr_values[-1].endswith('"'): break

1 0

[stem/master] Add tests for stem.response.events.Event
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit 26a39c9ac5bf77860f2a10dd776c95ce46ef6380 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 14:13:38 2012 -0700 Add tests for stem.response.events.Event This tests the base class used to build named event classes (e.g. ADDRMAP, BW, CIRC, etc.). Mainly this documents existing behavior so we can check future changes to the class do not surprise us with breakage. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/response/events.py | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 1a40958..91eaa18 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -235,6 +235,16 @@ class TestEvents(unittest.TestCase): time.sleep(0.2) events_thread.join() + def test_event(self): + # synthetic, contrived message construction to reach the blank event check + self.assertRaises(ProtocolError, stem.response.convert, "EVENT", stem.response.ControlMessage([('', '', '')], ''), arrived_at = 25) + + # Event._parse_message() on an unknown event type + event = _get_event('650 NONE SOLID "NON SENSE" condition=MEH quoted="1 2 3"') + self.assertEqual("NONE", event.type) + self.assertEqual(["SOLID", '"NON', 'SENSE"'], event.positional_args) + self.assertEqual({"condition":"MEH", "quoted":"1 2 3"}, event.keyword_args) + def test_log_events(self): event = _get_event("650 DEBUG connection_edge_process_relay_cell(): Got an extended cell! Yay.")

1 0

[stem/master] Unit tests for event error conditions
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit a201c0c5f4b92b119f89fa39bd43680d67a64817 Merge: e30f2df 256676d Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 15 13:46:08 2012 -0800 Unit tests for event error conditions Testing expansion from Sean for malformed event content, plus a couple fixes. https://trac.torproject.org/7736 stem/response/events.py | 7 +- test/unit/response/events.py | 288 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 250 insertions(+), 45 deletions(-)

1 0

[stem/master] Add test cases for STREAM events
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit b3aca85301439fd2441d098775b9c56d7365c506 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 16:28:25 2012 -0700 Add test cases for STREAM events These test events exercise all the exceptions in StreamEvent._parse() and the case of an empty target address:port. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/response/events.py | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 7fb39c6..bda2d5a 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -295,6 +295,19 @@ STREAM_DNS_REQUEST = "650 STREAM 1113 NEW 0 www.google.com:0 \ SOURCE_ADDR=127.0.0.1:15297 \ PURPOSE=DNS_REQUEST" +STREAM_SENTCONNECT_BAD_1 = "650 STREAM 18 SENTCONNECT 26" +STREAM_SENTCONNECT_BAD_2 = "650 STREAM 18 SENTCONNECT 26 encrypted.google.com" +STREAM_SENTCONNECT_BAD_3 = "650 STREAM 18 SENTCONNECT 26 encrypted.google.com:https" + +STREAM_DNS_REQUEST_BAD_1 = "650 STREAM 1113 NEW 0 www.google.com:0 \ +SOURCE_ADDR=127.0.0.1 \ +PURPOSE=DNS_REQUEST" + +STREAM_DNS_REQUEST_BAD_2 = "650 STREAM 1113 NEW 0 www.google.com:0 \ +SOURCE_ADDR=127.0.0.1:dns \ +PURPOSE=DNS_REQUEST" + + def _get_event(content): controller_event = mocking.get_message(content) stem.response.convert("EVENT", controller_event, arrived_at = 25) @@ -1023,6 +1036,29 @@ class TestEvents(unittest.TestCase): self.assertEqual("127.0.0.1", event.source_address) self.assertEqual(15297, event.source_port) self.assertEqual(StreamPurpose.DNS_REQUEST, event.purpose) + + event = _get_event(STREAM_SENTCONNECT_BAD_1) + + self.assertTrue(isinstance(event, stem.response.events.StreamEvent)) + self.assertEqual(STREAM_SENTCONNECT_BAD_1.lstrip("650 "), str(event)) + self.assertEqual("18", event.id) + self.assertEqual(StreamStatus.SENTCONNECT, event.status) + self.assertEqual("26", event.circ_id) + self.assertEqual(None, event.target) + self.assertEqual(None, event.target_address) + self.assertEqual(None, event.target_port) + self.assertEqual(None, event.reason) + self.assertEqual(None, event.remote_reason) + self.assertEqual(None, event.source) + self.assertEqual(None, event.source_addr) + self.assertEqual(None, event.source_address) + self.assertEqual(None, event.source_port) + self.assertEqual(None, event.purpose) + + self.assertRaises(ProtocolError, _get_event, STREAM_SENTCONNECT_BAD_2) + self.assertRaises(ProtocolError, _get_event, STREAM_SENTCONNECT_BAD_3) + self.assertRaises(ProtocolError, _get_event, STREAM_DNS_REQUEST_BAD_1) + self.assertRaises(ProtocolError, _get_event, STREAM_DNS_REQUEST_BAD_2) def test_stream_bw_event(self): event = _get_event("650 STREAM_BW 2 15 25")

1 0