From 14081bed46399cac578182d48464b954e0fcdc17 Mon Sep 17 00:00:00 2001 From: Daniel Schauenberg Date: Sat, 17 Sep 2011 17:25:27 +0200 Subject: [PATCH 1/7] add unit test for api.request --- tests/unit/test_requests_api.py | 39 +++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/tests/unit/test_requests_api.py b/tests/unit/test_requests_api.py index 98591c3b..7835fdaa 100755 --- a/tests/unit/test_requests_api.py +++ b/tests/unit/test_requests_api.py @@ -26,6 +26,45 @@ class RequestsAPIUnitTests(unittest.TestCase): pass + @mock.patch('requests.api.dispatch_hook') + @mock.patch('requests.api.Request') + @mock.patch('requests.api.cookiejar_from_dict') + def test_request(self, mock_cjar, mock_request, mock_hook): + args = dict( + method = None, + url = None, + data = None, + params = None, + headers = None, + cookiejar = None, + files = None, + auth = None, + timeout = 1, + allow_redirects = None, + proxies = None, + ) + hooks = {'args': args, 'pre_request': mock_request, + 'post_request': mock_request, 'response': 'response'} + sideeffect = lambda x,y,z: hooks[x] + mock_cjar.return_value = None + mock_request.send = mock.Mock(return_value={}) + mock_request.response = "response" + mock_hook.side_effect = sideeffect + + r = requests.request('get','http://google.com') + + + mock_cjar.assert_called_once_with({}) + mock_hook.assert_called__with('args', None, args) + mock_request.assert_called_once_with(**args) + mock_hook.assert_called__with('pre_request', None, mock_request) + mock_request.send.assert_called_once_with() + mock_hook.assert_called__with('post_request', None, mock_request) + mock_hook.assert_called__with('response', None, mock_request) + self.assertEqual(r, "response") + + + @mock.patch('requests.api.request') def test_http_get(self, mock_request): mock_request.return_value = Response() From cb2e87210c0af4217aa9a1159a08c5634cd85ab2 Mon Sep 17 00:00:00 2001 From: Daniel Schauenberg Date: Sat, 17 Sep 2011 17:50:19 +0200 Subject: [PATCH 2/7] add test with kwargs for api.get --- tests/unit/test_requests_api.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/unit/test_requests_api.py b/tests/unit/test_requests_api.py index 7835fdaa..62f0b6cb 100755 --- a/tests/unit/test_requests_api.py +++ b/tests/unit/test_requests_api.py @@ -72,6 +72,22 @@ class RequestsAPIUnitTests(unittest.TestCase): mock_request.assert_called_once_with('get', 'http://google.com', allow_redirects= True) + @mock.patch('requests.api.request') + def test_http_get_with_kwargs(self, mock_request): + mock_request.return_value = Response() + requests.get('http://google.com', + params="params", data="data", headers="headers", + cookies="cookies", + files="files", auth="auth", timeout="timeout", + allow_redirects=False, + proxies="proxies", hooks="hooks") + mock_request.assert_called_once_with('get', 'http://google.com', + params="params", data="data", headers="headers", + cookies="cookies", + files="files", auth="auth", timeout="timeout", + allow_redirects=False, + proxies="proxies", hooks="hooks") + @mock.patch('requests.api.request') def test_http_head(self, mock_request): mock_request.return_value = Response() From 5c5c13a28f48770d826cdebfb7bd62dffd15c117 Mon Sep 17 00:00:00 2001 From: Daniel Schauenberg Date: Sat, 17 Sep 2011 17:52:07 +0200 Subject: [PATCH 3/7] add test with kwargs for api.head --- tests/unit/test_requests_api.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tests/unit/test_requests_api.py b/tests/unit/test_requests_api.py index 62f0b6cb..bee0cf28 100755 --- a/tests/unit/test_requests_api.py +++ b/tests/unit/test_requests_api.py @@ -96,6 +96,21 @@ class RequestsAPIUnitTests(unittest.TestCase): allow_redirects= True) @mock.patch('requests.api.request') + def test_http_head_with_kwargs(self, mock_request): + mock_request.return_value = Response() + requests.head('http://google.com', + params="params", data="data", headers="headers", + cookies="cookies", + files="files", auth="auth", timeout="timeout", + allow_redirects=False, + proxies="proxies", hooks="hooks") + mock_request.assert_called_once_with('head', 'http://google.com', + params="params", data="data", headers="headers", + cookies="cookies", + files="files", auth="auth", timeout="timeout", + allow_redirects=False, + proxies="proxies", hooks="hooks") + def test_http_post(self, mock_request): mock_request.return_value = Response() requests.post('http://google.com', {}) From 29f7a5bcfa0c4b95df66218c78ac8d219af48563 Mon Sep 17 00:00:00 2001 From: Daniel Schauenberg Date: Sat, 17 Sep 2011 17:53:01 +0200 Subject: [PATCH 4/7] add test with kwargs for api.post --- tests/unit/test_requests_api.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/unit/test_requests_api.py b/tests/unit/test_requests_api.py index bee0cf28..e9868cd8 100755 --- a/tests/unit/test_requests_api.py +++ b/tests/unit/test_requests_api.py @@ -111,6 +111,7 @@ class RequestsAPIUnitTests(unittest.TestCase): allow_redirects=False, proxies="proxies", hooks="hooks") + @mock.patch('requests.api.request') def test_http_post(self, mock_request): mock_request.return_value = Response() requests.post('http://google.com', {}) @@ -118,6 +119,22 @@ class RequestsAPIUnitTests(unittest.TestCase): data= {}) @mock.patch('requests.api.request') + def test_http_post_with_kwargs(self, mock_request): + mock_request.return_value = Response() + requests.post('http://google.com', + params="params", data="data", headers="headers", + cookies="cookies", + files="files", auth="auth", timeout="timeout", + allow_redirects=False, + proxies="proxies", hooks="hooks") + mock_request.assert_called_once_with('post', 'http://google.com', + params="params", data="data", headers="headers", + cookies="cookies", + files="files", auth="auth", timeout="timeout", + allow_redirects=False, + proxies="proxies", hooks="hooks") + + def test_http_put(self, mock_request): mock_request.return_value = Response() requests.put('http://google.com', {}) From 42c45df84d64b04da4702a94d7fa42d01501b218 Mon Sep 17 00:00:00 2001 From: Daniel Schauenberg Date: Sat, 17 Sep 2011 17:53:27 +0200 Subject: [PATCH 5/7] add test with kwargs for api.put --- tests/unit/test_requests_api.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/unit/test_requests_api.py b/tests/unit/test_requests_api.py index e9868cd8..8c7725e9 100755 --- a/tests/unit/test_requests_api.py +++ b/tests/unit/test_requests_api.py @@ -135,6 +135,7 @@ class RequestsAPIUnitTests(unittest.TestCase): proxies="proxies", hooks="hooks") + @mock.patch('requests.api.request') def test_http_put(self, mock_request): mock_request.return_value = Response() requests.put('http://google.com', {}) @@ -142,6 +143,22 @@ class RequestsAPIUnitTests(unittest.TestCase): data= {}) @mock.patch('requests.api.request') + def test_http_put_with_kwargs(self, mock_request): + mock_request.return_value = Response() + requests.put('http://google.com', + params="params", data="data", headers="headers", + cookies="cookies", + files="files", auth="auth", timeout="timeout", + allow_redirects=False, + proxies="proxies", hooks="hooks") + mock_request.assert_called_once_with('put', 'http://google.com', + params="params", data="data", headers="headers", + cookies="cookies", + files="files", auth="auth", timeout="timeout", + allow_redirects=False, + proxies="proxies", hooks="hooks") + + def test_http_patch(self, mock_request): mock_request.return_value = Response() requests.patch('http://google.com', {}) From 1d1927bb2b957658212ef89eb3cefdcc0a942033 Mon Sep 17 00:00:00 2001 From: Daniel Schauenberg Date: Sat, 17 Sep 2011 17:53:49 +0200 Subject: [PATCH 6/7] add test with kwargs for api.patch --- tests/unit/test_requests_api.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/unit/test_requests_api.py b/tests/unit/test_requests_api.py index 8c7725e9..aef2a35c 100755 --- a/tests/unit/test_requests_api.py +++ b/tests/unit/test_requests_api.py @@ -159,6 +159,7 @@ class RequestsAPIUnitTests(unittest.TestCase): proxies="proxies", hooks="hooks") + @mock.patch('requests.api.request') def test_http_patch(self, mock_request): mock_request.return_value = Response() requests.patch('http://google.com', {}) @@ -166,6 +167,21 @@ class RequestsAPIUnitTests(unittest.TestCase): data= {}) @mock.patch('requests.api.request') + def test_http_patch_with_kwargs(self, mock_request): + mock_request.return_value = Response() + requests.patch('http://google.com', + params="params", data="data", headers="headers", + cookies="cookies", + files="files", auth="auth", timeout="timeout", + allow_redirects=False, + proxies="proxies", hooks="hooks") + mock_request.assert_called_once_with('patch', 'http://google.com', + params="params", data="data", headers="headers", + cookies="cookies", + files="files", auth="auth", timeout="timeout", + allow_redirects=False, + proxies="proxies", hooks="hooks") + def test_http_delete(self, mock_request): mock_request.return_value = Response() requests.delete('http://google.com') From 1481e9ae6a3ef8f507b944840c98aea0f3f23920 Mon Sep 17 00:00:00 2001 From: Daniel Schauenberg Date: Sat, 17 Sep 2011 17:54:18 +0200 Subject: [PATCH 7/7] add test with kwargs for api.delete --- tests/unit/test_requests_api.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/unit/test_requests_api.py b/tests/unit/test_requests_api.py index aef2a35c..ae63ab85 100755 --- a/tests/unit/test_requests_api.py +++ b/tests/unit/test_requests_api.py @@ -182,10 +182,28 @@ class RequestsAPIUnitTests(unittest.TestCase): allow_redirects=False, proxies="proxies", hooks="hooks") + @mock.patch('requests.api.request') def test_http_delete(self, mock_request): mock_request.return_value = Response() requests.delete('http://google.com') mock_request.assert_called_once_with('delete', 'http://google.com') + @mock.patch('requests.api.request') + def test_http_delete_with_kwargs(self, mock_request): + mock_request.return_value = Response() + requests.delete('http://google.com', + params="params", data="data", headers="headers", + cookies="cookies", + files="files", auth="auth", timeout="timeout", + allow_redirects=False, + proxies="proxies", hooks="hooks") + mock_request.assert_called_once_with('delete', 'http://google.com', + params="params", data="data", headers="headers", + cookies="cookies", + files="files", auth="auth", timeout="timeout", + allow_redirects=False, + proxies="proxies", hooks="hooks") + + if __name__ == '__main__': unittest.main()