commit 356600f1c49dd02bf925f296104ffe708a80ec9e Author: Sebastian Hahn sebastian@torproject.org Date: Mon Feb 9 20:17:14 2015 +0100
Gabelmoo's IP address changed --- docs/tutorials/examples/votes_by_bandwidth_authorities.rst | 2 +- test/unit/descriptor/networkstatus/directory_authority.py | 6 +++--- test/unit/descriptor/networkstatus/document_v3.py | 2 +- test/unit/tutorial_examples.py | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/docs/tutorials/examples/votes_by_bandwidth_authorities.rst b/docs/tutorials/examples/votes_by_bandwidth_authorities.rst index 4e7aa00..c413c96 100644 --- a/docs/tutorials/examples/votes_by_bandwidth_authorities.rst +++ b/docs/tutorials/examples/votes_by_bandwidth_authorities.rst @@ -51,7 +51,7 @@ gets their current votes then prints how many relays it had a measurement for. ::
% python bandwidth_auth_measured_counts.py - Getting gabelmoo's vote from http://212.112.245.170:80/tor/status-vote/current/authority: + Getting gabelmoo's vote from http://131.188.40.189:80/tor/status-vote/current/authority: 5935 measured entries and 1332 unmeasured Getting tor26's vote from http://86.59.21.38:80/tor/status-vote/current/authority: 5735 measured entries and 1690 unmeasured diff --git a/test/unit/descriptor/networkstatus/directory_authority.py b/test/unit/descriptor/networkstatus/directory_authority.py index 0c44a1e..c1dc319 100644 --- a/test/unit/descriptor/networkstatus/directory_authority.py +++ b/test/unit/descriptor/networkstatus/directory_authority.py @@ -62,13 +62,13 @@ class TestDirectoryAuthority(unittest.TestCase): Parses an authority using the '-legacy' format. """
- content = 'dir-source gabelmoo-legacy 81349FC1F2DBA2C2C11B45CB9706637D480AB913 212.112.245.170 212.112.245.170 80 443' + content = 'dir-source gabelmoo-legacy 81349FC1F2DBA2C2C11B45CB9706637D480AB913 131.188.40.189 131.188.40.189 80 443' authority = DirectoryAuthority(content, is_vote = False)
self.assertEqual('gabelmoo-legacy', authority.nickname) self.assertEqual('81349FC1F2DBA2C2C11B45CB9706637D480AB913', authority.fingerprint) - self.assertEqual('212.112.245.170', authority.hostname) - self.assertEqual('212.112.245.170', authority.address) + self.assertEqual('131.188.40.189', authority.hostname) + self.assertEqual('131.188.40.189', authority.address) self.assertEqual(80, authority.dir_port) self.assertEqual(443, authority.or_port) self.assertEqual(True, authority.is_legacy) diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index 3ed7fbe..2f847d7 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -1136,7 +1136,7 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= Includes both normal authorities and those following the '-legacy' format. """
- legacy_content = 'dir-source gabelmoo-legacy 81349FC1F2DBA2C2C11B45CB9706637D480AB913 212.112.245.170 212.112.245.170 80 443' + legacy_content = 'dir-source gabelmoo-legacy 81349FC1F2DBA2C2C11B45CB9706637D480AB913 131.188.40.189 131.188.40.189 80 443'
authority1 = get_directory_authority({'contact': 'doctor jekyll'}, is_vote = False) authority2 = DirectoryAuthority(legacy_content, validate = True, is_vote = False) diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index 10d80dd..2985281 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -90,7 +90,7 @@ moria1 has the Running flag but maatuska doesn't: DCAEC3D069DC39AAE43D13C8AF31B5 """
VOTES_BY_BANDWIDTH_AUTHORITIES_OUTPUT = """\ -Getting gabelmoo's vote from http://212.112.245.170:80/tor/status-vote/current/authority: +Getting gabelmoo's vote from http://131.188.40.189:80/tor/status-vote/current/authority: 5935 measured entries and 1332 unmeasured Getting tor26's vote from http://86.59.21.38:80/tor/status-vote/current/authority: 5735 measured entries and 1690 unmeasured @@ -408,14 +408,14 @@ class TestTutorialExamples(unittest.TestCase): DIRECTORY_AUTHORITIES['maatuska'], ]
- directory_values[0].address = '212.112.245.170' + directory_values[0].address = '131.188.40.189' get_authorities_mock().values.return_value = directory_values
entry_with_measurement = get_router_status_entry_v3({'w': 'Bandwidth=1 Measured=1'}) entry_without_measurement = get_router_status_entry_v3()
query1 = Mock() - query1.download_url = 'http://212.112.245.170:80/tor/status-vote/current/authority' + 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()