x/requests-mock
Code Issues Proposed changes

Merge "Add called and call_count to mocker"

Browse Source
This commit is contained in:
Jenkins 2014-12-16 19:35:41 +00:00 committed by Gerrit Code Review
commit 7b0648a921
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
requests_mock/mocker.py
View File

@ -36,7 +36,9 @@ class MockerCore(object):
_PROXY_FUNCS = set(['last_request',
'register_uri',
'add_matcher',
'request_history'])
'request_history',
'called',
'call_count'])
def __init__(self, **kwargs):
self._adapter = adapter.Adapter()

16
requests_mock/tests/test_mocker.py
View File

@ -30,9 +30,10 @@ class MockerTests(base.TestCase):
def _do_test(self, m):
self.assertMockStarted()
m.register_uri('GET', 'http://www.test.com', text='resp')
matcher = m.register_uri('GET', 'http://www.test.com', text='resp')
resp = requests.get('http://www.test.com')
self.assertEqual('resp', resp.text)
return matcher
def test_multiple_starts(self):
mocker = requests_mock.Mocker()
@ -100,6 +101,19 @@ class MockerTests(base.TestCase):
self.assertEqual(['1'], m.last_request.qs['a'])
self.assertEqual(['2'], m.last_request.qs['b'])
@requests_mock.mock()
def test_mock_matcher_attributes(self, m):
matcher = self._do_test(m)
self.assertEqual(1, matcher.call_count)
self.assertEqual(1, m.call_count)
self.assertTrue(matcher.called)
self.assertTrue(m.called)
self.assertEqual(m.request_history, matcher.request_history)
self.assertIs(m.last_request, matcher.last_request)
class MockerHttpMethodsTests(base.TestCase):