Fix ResourceWarning unclosed socket and re-enable and fix tornado tests #801
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This PR fixes issue kevin1024#710 by properly closing the underlying socket. It first uses `pool._put_conn` to keep the connection in the pool, and later removes and closes it when the context manager exits. I was unsure about the exact purpose of the `ConnectonRemove` class, so I made minimal changes to minimize the risk of breaking the code and there may be better solutions for fixing this issue. For example, the `urllib3.connectionpool.HTTPConnectionPool` will utilize a weakref to terminate pool connections. By appending our connection to it, it will also take care of closing our connection. So another solution could be to modify the `__exit__` in `patch.ConnectionRemover` method and add our connection to the pool: ```py class ConnectionRemover: ... def __exit__(self, *args): for pool, connections in self._connection_pool_to_connections.items(): for connection in connections: if isinstance(connection, self._connection_class): pool._put_conn(connection) ```
Codecov ReportAll modified and coverable lines are covered by tests ✅
❗ Your organization needs to install the Codecov GitHub app to enable full functionality. Additional details and impacted files@@ Coverage Diff @@
## master #801 +/- ##
==========================================
- Coverage 90.13% 89.63% -0.51%
==========================================
Files 27 27
Lines 1815 1813 -2
Branches 336 282 -54
==========================================
- Hits 1636 1625 -11
- Misses 134 142 +8
- Partials 45 46 +1 ☔ View full report in Codecov by Sentry. |
graingert
commented
Dec 15, 2023
| @@ -260,6 +259,12 @@ def test_aiohttp_test_client_json(aiohttp_client, tmpdir): | |||
| assert cassette.play_count == 1 | |||
|
|
|||
|
|
|||
| def test_cleanup_from_pytest_asyncio(): | |||
| # work around https://github.com/pytest-dev/pytest-asyncio/issues/724 | |||
There was a problem hiding this comment.
|
@graingert please, rebase your branch with master. |
graingert
force-pushed
the
fix-resource-warning-2
branch
from
2924107
to
b7f6c2f
Compare
graingert
changed the title
|
@jairhenrique thanks! Turns out the tornado tests were not running, but thanks to filterwarnings=error I have discovered this and fixed it. |
graingert
commented
Jan 23, 2024
Comment on lines
+16
to
+19
| '''ignore:There is no current event loop:DeprecationWarning''', | ||
| '''ignore:make_current is deprecated; start the event loop first:DeprecationWarning''', | ||
| '''ignore:clear_current is deprecated:DeprecationWarning''', | ||
| '''ignore:the \(type, exc, tb\) signature of throw\(\) is deprecated, use the single-arg signature instead.:DeprecationWarning''', |
There was a problem hiding this comment.
I'll fix these deprecation warnings in a followup PR
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.