From 3231e7c269afa9a0cf6bc42faf4b1d037bcf4fd8 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 19 Feb 2026 01:02:05 +0000 Subject: [PATCH] Reset mocks more cleanly The previous approach breaks on Python 3.13.2 and 3.14.3 due to the fix for https://github.com/python/cpython/issues/142651. Fixes: #267 --- tests/asynctests/test_async_client.py | 8 ++++---- tests/test_client.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/asynctests/test_async_client.py b/tests/asynctests/test_async_client.py index 24a4f8f0f8..3a6d52e6fc 100644 --- a/tests/asynctests/test_async_client.py +++ b/tests/asynctests/test_async_client.py @@ -85,7 +85,6 @@ def side_effect(*args, **kwargs): request = ClientRequest('GET', '/') await client.async_send(request, stream=False) - session.request.call_count = 0 session.request.assert_called_with( 'GET', '/', @@ -99,6 +98,7 @@ def side_effect(*args, **kwargs): timeout=100, verify=True ) + session.request.reset_mock() assert session.resolve_redirects.is_msrest_patched request = client.get('/', headers={'id':'1234'}, content={'Test':'Data'}) @@ -121,7 +121,7 @@ def side_effect(*args, **kwargs): verify=True ) assert session.request.call_count == 1 - session.request.call_count = 0 + session.request.reset_mock() assert session.resolve_redirects.is_msrest_patched request = client.get('/', headers={'id':'1234'}, content={'Test':'Data'}) @@ -146,14 +146,14 @@ def side_effect(*args, **kwargs): verify=True ) assert session.request.call_count == 1 - session.request.call_count = 0 + session.request.reset_mock() assert session.resolve_redirects.is_msrest_patched session.request.side_effect = oauth2.rfc6749.errors.InvalidGrantError("test") with pytest.raises(TokenExpiredError): await client.async_send(request, headers={'id':'1234'}, content={'Test':'Data'}, test='value') assert session.request.call_count == 2 - session.request.call_count = 0 + session.request.reset_mock() session.request.side_effect = ValueError("test") with pytest.raises(ValueError): diff --git a/tests/test_client.py b/tests/test_client.py index 0eb05901ce..ec53ed5daa 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -293,7 +293,6 @@ def side_effect(*args, **kwargs): request = ClientRequest('GET', '/') client.send(request, stream=False) - session.request.call_count = 0 session.request.assert_called_with( 'GET', '/', @@ -307,6 +306,7 @@ def side_effect(*args, **kwargs): timeout=100, verify=True ) + session.request.reset_mock() assert session.resolve_redirects.is_msrest_patched client.send(request, headers={'id':'1234'}, content={'Test':'Data'}, stream=False) @@ -327,7 +327,7 @@ def side_effect(*args, **kwargs): verify=True ) self.assertEqual(session.request.call_count, 1) - session.request.call_count = 0 + session.request.reset_mock() assert session.resolve_redirects.is_msrest_patched session.request.side_effect = requests.RequestException("test") @@ -350,14 +350,14 @@ def side_effect(*args, **kwargs): verify=True ) self.assertEqual(session.request.call_count, 1) - session.request.call_count = 0 + session.request.reset_mock() assert session.resolve_redirects.is_msrest_patched session.request.side_effect = oauth2.rfc6749.errors.InvalidGrantError("test") with self.assertRaises(TokenExpiredError): client.send(request, headers={'id':'1234'}, content={'Test':'Data'}, test='value') self.assertEqual(session.request.call_count, 2) - session.request.call_count = 0 + session.request.reset_mock() session.request.side_effect = ValueError("test") with self.assertRaises(ValueError):