kennethreitz/requests
1
0
Fork 0
mirror of https://github.com/kennethreitz/requests.git synced 2026-06-05 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Kenneth Reitz
2012-03-31 17:39:31 -04:00
parent 2bae0d295b 8755969629
commit ccd19c53c8
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MANIFEST.in
+1 -1
View File
@@ -1 +1 @@
include README.rst LICENSE NOTICE HISTORY.rst test_requests.py
include README.rst LICENSE NOTICE HISTORY.rst tests/*.py
tests/test_requests.py
+4 -5
View File
@@ -29,7 +29,6 @@ HTTPBIN_URL = os.environ.get('HTTPBIN_URL')
def httpbin(*suffix):
"""Returns url for HTTPBIN resource."""
return HTTPBIN_URL + '/'.join(suffix)
@@ -77,11 +76,11 @@ class RequestsTestSuite(TestSetup, unittest.TestCase):
self.assertEqual(request.path_url, "/get/test%20case")
def test_HTTP_200_OK_GET(self):
r = get(httpbin('/get'))
r = get(httpbin('get'))
self.assertEqual(r.status_code, 200)
def test_response_sent(self):
r = get(httpbin('/get'))
r = get(httpbin('get'))
self.assertTrue(r.request.sent)
@@ -204,7 +203,7 @@ class RequestsTestSuite(TestSetup, unittest.TestCase):
self.assertTrue(heads['user-agent'] in r.text)
def test_HTTP_200_OK_HEAD(self):
r = head(httpbin('/get'))
r = head(httpbin('get'))
self.assertEqual(r.status_code, 200)
def test_HTTP_200_OK_PUT(self):
@@ -533,7 +532,7 @@ class RequestsTestSuite(TestSetup, unittest.TestCase):
def test_session_HTTP_200_OK_GET(self):
s = requests.session()
r = get(httpbin('/get'), session=s)
r = get(httpbin('get'), session=s)
self.assertEqual(r.status_code, 200)
def test_session_persistent_headers(self):