Skip to content

Commit 3231e7c

Browse files
cjwatsoncjwatson
committed
Reset mocks more cleanly
The previous approach breaks on Python 3.13.2 and 3.14.3 due to the fix for python/cpython#142651. Fixes: Azure#267
1 parent af41991 commit 3231e7c

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎tests/asynctests/test_async_client.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ def side_effect(*args, **kwargs):
8585

8686
request = ClientRequest('GET', '/')
8787
await client.async_send(request, stream=False)
88-
session.request.call_count = 0
8988
session.request.assert_called_with(
9089
'GET',
9190
'/',
@@ -99,6 +98,7 @@ def side_effect(*args, **kwargs):
9998
timeout=100,
10099
verify=True
101100
)
101+
session.request.reset_mock()
102102
assert session.resolve_redirects.is_msrest_patched
103103

104104
request = client.get('/', headers={'id':'1234'}, content={'Test':'Data'})
@@ -121,7 +121,7 @@ def side_effect(*args, **kwargs):
121121
verify=True
122122
)
123123
assert session.request.call_count == 1
124-
session.request.call_count = 0
124+
session.request.reset_mock()
125125
assert session.resolve_redirects.is_msrest_patched
126126

127127
request = client.get('/', headers={'id':'1234'}, content={'Test':'Data'})
@@ -146,14 +146,14 @@ def side_effect(*args, **kwargs):
146146
verify=True
147147
)
148148
assert session.request.call_count == 1
149-
session.request.call_count = 0
149+
session.request.reset_mock()
150150
assert session.resolve_redirects.is_msrest_patched
151151

152152
session.request.side_effect = oauth2.rfc6749.errors.InvalidGrantError("test")
153153
with pytest.raises(TokenExpiredError):
154154
await client.async_send(request, headers={'id':'1234'}, content={'Test':'Data'}, test='value')
155155
assert session.request.call_count == 2
156-
session.request.call_count = 0
156+
session.request.reset_mock()
157157

158158
session.request.side_effect = ValueError("test")
159159
with pytest.raises(ValueError):

‎tests/test_client.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@ def side_effect(*args, **kwargs):
293293

294294
request = ClientRequest('GET', '/')
295295
client.send(request, stream=False)
296-
session.request.call_count = 0
297296
session.request.assert_called_with(
298297
'GET',
299298
'/',
@@ -307,6 +306,7 @@ def side_effect(*args, **kwargs):
307306
timeout=100,
308307
verify=True
309308
)
309+
session.request.reset_mock()
310310
assert session.resolve_redirects.is_msrest_patched
311311

312312
client.send(request, headers={'id':'1234'}, content={'Test':'Data'}, stream=False)
@@ -327,7 +327,7 @@ def side_effect(*args, **kwargs):
327327
verify=True
328328
)
329329
self.assertEqual(session.request.call_count, 1)
330-
session.request.call_count = 0
330+
session.request.reset_mock()
331331
assert session.resolve_redirects.is_msrest_patched
332332

333333
session.request.side_effect = requests.RequestException("test")
@@ -350,14 +350,14 @@ def side_effect(*args, **kwargs):
350350
verify=True
351351
)
352352
self.assertEqual(session.request.call_count, 1)
353-
session.request.call_count = 0
353+
session.request.reset_mock()
354354
assert session.resolve_redirects.is_msrest_patched
355355

356356
session.request.side_effect = oauth2.rfc6749.errors.InvalidGrantError("test")
357357
with self.assertRaises(TokenExpiredError):
358358
client.send(request, headers={'id':'1234'}, content={'Test':'Data'}, test='value')
359359
self.assertEqual(session.request.call_count, 2)
360-
session.request.call_count = 0
360+
session.request.reset_mock()
361361

362362
session.request.side_effect = ValueError("test")
363363
with self.assertRaises(ValueError):

0 commit comments

Comments
 (0)