Skip to content

Commit 415bb24

Browse files
committed
test: isolate pool cleanup on transport failures
Signed-off-by: Vu Anh Phung <vu.phung@databricks.com>
1 parent e0dd510 commit 415bb24

2 files changed

Lines changed: 13 additions & 3 deletions

File tree

‎tests/e2e/common/retry_test_mixins.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,12 @@ def dispatch(pool, *args, **kwargs):
3434
with ExitStack() as stack:
3535
stack.enter_context(patch.object(HTTPSConnectionPool, method_name, dispatch))
3636
if method_name == "_get_conn":
37+
mock_method.return_value.close.return_value = None
3738
original_put = HTTPSConnectionPool._put_conn
3839

3940
def put_connection(pool, connection):
4041
# Fake acquisition never removed a slot from the real queue.
41-
if connection is not mock_method.return_value:
42+
if threading.current_thread() is not test_thread:
4243
return original_put(pool, connection)
4344

4445
stack.enter_context(

‎tests/unit/test_retry_test_isolation.py‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ def test_background_telemetry_does_not_receive_retry_errors(pending_telemetry):
8989
assert validate.call_count == 2
9090

9191

92-
def test_mocked_connections_do_not_leak_into_a_shared_pool():
92+
@pytest.mark.parametrize("transport_error", [False, True])
93+
def test_mocked_connections_do_not_leak_into_a_shared_pool(transport_error):
9394
ready, release = Event(), Event()
9495
responses = [
9596
{"status": 429, "headers": {"Retry-After": "0"}, "redirect_location": None},
@@ -115,6 +116,10 @@ def send():
115116
assert ready.wait(timeout=5)
116117
try:
117118
with mock_sequential_server_responses(responses) as mocked_connection:
119+
if transport_error:
120+
mocked_connection.return_value.request.side_effect = OSError(
121+
"Some arbitrary network error"
122+
)
118123
with pytest.raises(MaxRetryError):
119124
pool.urlopen(
120125
"POST",
@@ -125,6 +130,10 @@ def send():
125130
)
126131
release.set()
127132
assert future.result(timeout=5) == [200, 200]
128-
assert mocked_connection.return_value.getresponse.call_count == 2
133+
expected_responses = 0 if transport_error else 2
134+
assert (
135+
mocked_connection.return_value.getresponse.call_count
136+
== expected_responses
137+
)
129138
finally:
130139
release.set()

0 commit comments

Comments
 (0)