Skip to content

Commit bfe0706

Browse files
authored
Clean up session warnings (#3468)
* Clean up some session warnings in tests * Rename TestMiddleware -> MockMiddleware to remove warnings * Add newsfragment
1 parent b8b0f70 commit bfe0706

File tree

5 files changed

+23
-9
lines changed

5 files changed

+23
-9
lines changed

newsfragments/3468.internal.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Test warning cleanup

tests/core/middleware/test_middleware.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
)
1313

1414

15-
class TestMiddleware(Web3Middleware):
15+
class MockMiddleware(Web3Middleware):
1616
def response_processor(self, method, response):
1717
if method == "eth_blockNumber":
1818
response["result"] = 1234
1919

2020
return response
2121

2222

23-
class TestMiddleware2(Web3Middleware):
23+
class MockMiddleware2(Web3Middleware):
2424
def response_processor(self, method, response):
2525
if method == "eth_blockNumber":
2626
response["result"] = 4321
@@ -32,15 +32,15 @@ def test_middleware_class_eq_magic_method():
3232
w3_a = Web3()
3333
w3_b = Web3()
3434

35-
mw1w3_a = TestMiddleware(w3_a)
35+
mw1w3_a = MockMiddleware(w3_a)
3636
assert mw1w3_a is not None
3737
assert mw1w3_a != ""
3838

39-
mw1w3_a_equal = TestMiddleware(w3_a)
39+
mw1w3_a_equal = MockMiddleware(w3_a)
4040
assert mw1w3_a == mw1w3_a_equal
4141

42-
mw2w3_a = TestMiddleware2(w3_a)
43-
mw1w3_b = TestMiddleware(w3_b)
42+
mw2w3_a = MockMiddleware2(w3_a)
43+
mw1w3_b = MockMiddleware(w3_b)
4444
assert mw1w3_a != mw2w3_a
4545
assert mw1w3_a != mw1w3_b
4646

@@ -72,10 +72,10 @@ def test_unnamed_middleware_are_given_unique_keys(w3):
7272

7373

7474
def test_unnamed_class_middleware_are_given_unique_keys(w3):
75-
w3.middleware_onion.add(TestMiddleware)
76-
w3.middleware_onion.add(TestMiddleware2)
75+
w3.middleware_onion.add(MockMiddleware)
76+
w3.middleware_onion.add(MockMiddleware2)
7777
assert isinstance(w3.eth.block_number, int)
7878

7979
with pytest.raises(Web3ValueError):
8080
# adding the same middleware again should cause an error
81-
w3.middleware_onion.add(TestMiddleware)
81+
w3.middleware_onion.add(MockMiddleware)

tests/core/providers/test_async_http_provider.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ async def test_async_no_args() -> None:
4545
assert not await w3.is_connected()
4646
with pytest.raises(ProviderConnectionError):
4747
await w3.is_connected(show_traceback=True)
48+
for cached_items in provider._request_session_manager.session_cache.items():
49+
cache_key, session = cached_items
50+
await session.close()
4851

4952

5053
def test_init_kwargs():
@@ -92,6 +95,7 @@ async def test_async_user_provided_session() -> None:
9295
cached_session = await provider.cache_async_session(session)
9396
assert len(provider._request_session_manager.session_cache) == 1
9497
assert cached_session == session
98+
await session.close()
9599

96100

97101
@pytest.mark.parametrize("provider", (AsyncHTTPProvider(), AsyncHTTPProvider))

tests/core/providers/test_async_ipc_provider.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,9 @@ async def test_async_iterator_pattern_exception_handling_for_requests(
234234
break
235235

236236
pytest.fail("Expected `ConnectionClosed` exception.")
237+
for cache_items in w3.provider._request_session_manager.session_cache.items():
238+
cache_key, session = cache_items
239+
await session.close()
237240

238241
assert exception_caught
239242

@@ -254,6 +257,9 @@ async def test_async_iterator_pattern_exception_handling_for_subscriptions(
254257
except ConnectionClosed:
255258
exception_caught = True
256259
break
260+
for cache_items in w3.provider._request_session_manager.session_cache.items():
261+
cache_key, session = cache_items
262+
await session.close()
257263

258264
pytest.fail("Expected `ConnectionClosed` exception.")
259265

tests/core/providers/test_async_tester_provider.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ async def test_async_tester_provider_is_connected() -> None:
1717
provider = AsyncEthereumTesterProvider()
1818
connected = await provider.is_connected()
1919
assert connected
20+
for cache_items in provider._request_cache.items():
21+
cache_key, session = cache_items
22+
await session.close()
2023

2124

2225
@pytest.mark.asyncio

0 commit comments

Comments
 (0)