1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
From: Colin Watson <cjwatson@debian.org>
Date: Thu, 19 Feb 2026 01:02:05 +0000
Subject: 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
Forwarded: https://github.com/Azure/msrest-for-python/pull/268
Bug: https://github.com/Azure/msrest-for-python/issues/267
Bug-Debian: https://bugs.debian.org/1127528
Last-Update: 2026-02-19
---
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 24a4f8f..3a6d52e 100644
--- a/tests/asynctests/test_async_client.py
+++ b/tests/asynctests/test_async_client.py
@@ -85,7 +85,6 @@ class TestServiceClient(object):
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 @@ class TestServiceClient(object):
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 @@ class TestServiceClient(object):
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 @@ class TestServiceClient(object):
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 0eb0590..ec53ed5 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -293,7 +293,6 @@ class TestServiceClient(unittest.TestCase):
request = ClientRequest('GET', '/')
client.send(request, stream=False)
- session.request.call_count = 0
session.request.assert_called_with(
'GET',
'/',
@@ -307,6 +306,7 @@ class TestServiceClient(unittest.TestCase):
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 @@ class TestServiceClient(unittest.TestCase):
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 @@ class TestServiceClient(unittest.TestCase):
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):
|
