ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-01 15:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make tests test _pick_a_http_server more directly.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2023-03-08 14:53:43 -05:00
parent 0093edcd93
commit 4db65ea936
1 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/allmydata/test/test_storage_client.py
View File

@ -8,7 +8,7 @@ from json import (
loads, loads,
) )
import hashlib import hashlib
from typing import Union, Any from typing import Union, Any, Optional
from hyperlink import DecodedURL from hyperlink import DecodedURL
from fixtures import ( from fixtures import (
@ -740,15 +740,15 @@ storage:
class PickHTTPServerTests(unittest.SynchronousTestCase): class PickHTTPServerTests(unittest.SynchronousTestCase):
"""Tests for ``_pick_a_http_server``.""" """Tests for ``_pick_a_http_server``."""
def loop_until_result(self, url_to_results: dict[DecodedURL, list[tuple[float, Union[Exception, Any]]]]) -> tuple[int, DecodedURL]: def pick_result(self, url_to_results: dict[DecodedURL, tuple[float, Union[Exception, Any]]]) -> Optional[DecodedURL]:
""" """
Given mapping of URLs to list of (delay, result), return the URL of the Given mapping of URLs to (delay, result), return the URL of the
first selected server. first selected server, or None.
""" """
clock = Clock() clock = Clock()
def request(reactor, url): def request(reactor, url):
delay, value = url_to_results[url].pop(0) delay, value = url_to_results[url]
result = Deferred() result = Deferred()
def add_result_value(): def add_result_value():
if isinstance(value, Exception): if isinstance(value, Exception):
@ -758,15 +758,10 @@ class PickHTTPServerTests(unittest.SynchronousTestCase):
reactor.callLater(delay, add_result_value) reactor.callLater(delay, add_result_value)
return result return result
iterations = 0 d = _pick_a_http_server(clock, list(url_to_results.keys()), request)
while True: for i in range(100):
iterations += 1 clock.advance(0.1)
d = _pick_a_http_server(clock, list(url_to_results.keys()), request) return self.successResultOf(d)
for i in range(100):
clock.advance(0.1)
result = self.successResultOf(d)
if result is not None:
return iterations, result
def test_first_successful_connect_is_picked(self): def test_first_successful_connect_is_picked(self):
""" """
@ -774,25 +769,22 @@ class PickHTTPServerTests(unittest.SynchronousTestCase):
""" """
earliest_url = DecodedURL.from_text("http://a") earliest_url = DecodedURL.from_text("http://a")
latest_url = DecodedURL.from_text("http://b") latest_url = DecodedURL.from_text("http://b")
iterations, result = self.loop_until_result({ bad_url = DecodedURL.from_text("http://bad")
latest_url: [(2, None)], result = self.pick_result({
earliest_url: [(1, None)] latest_url: (2, None),
earliest_url: (1, None),
bad_url: (0.5, RuntimeError()),
}) })
self.assertEqual(iterations, 1)
self.assertEqual(result, earliest_url) self.assertEqual(result, earliest_url)
def test_failures_are_retried(self): def test_failures_are_retried(self):
""" """
If the initial requests all fail, ``_pick_a_http_server`` keeps trying If the requests all fail, ``_pick_a_http_server`` returns ``None``.
until success.
""" """
eventually_good_url = DecodedURL.from_text("http://good") eventually_good_url = DecodedURL.from_text("http://good")
bad_url = DecodedURL.from_text("http://bad") bad_url = DecodedURL.from_text("http://bad")
iterations, result = self.loop_until_result({ result = self.pick_result({
eventually_good_url: [ eventually_good_url: (1, ZeroDivisionError()),
(1, ZeroDivisionError()), (0.1, ZeroDivisionError()), (1, None) bad_url: (0.1, RuntimeError())
],
bad_url: [(0.1, RuntimeError()), (0.1, RuntimeError()), (0.1, RuntimeError())]
}) })
self.assertEqual(iterations, 3) self.assertEqual(result, None)
self.assertEqual(result, eventually_good_url)