commit 2719fd3c44e8623f07094687146839aed0285e63
Author: Damian Johnson <ata...@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')
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
