Skip to content

Reset mocks more cleanly #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cjwatson wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −8
Open

Reset mocks more cleanly #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tests/asynctests/test_async_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
'/',
Expand All @@ -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'})
Expand All @@ -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'})
Expand All @@ -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):
Expand Down
8 changes: 4 additions & 4 deletions tests/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
'/',
Expand All @@ -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)
Expand All @@ -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")
Expand All @@ -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):
Expand Down