Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

  • Loading branch information...
commit ccd19c53c887a1232d0870bddc4c1631fd8f2797 2 parents 2bae0d2 + 8755969
@kennethreitz kennethreitz authored
Showing with 5 additions and 6 deletions.
  1. +1 −1  MANIFEST.in
  2. +4 −5 tests/test_requests.py
View
2  MANIFEST.in
@@ -1 +1 @@
-include README.rst LICENSE NOTICE HISTORY.rst test_requests.py
+include README.rst LICENSE NOTICE HISTORY.rst tests/*.py
View
9 tests/test_requests.py
@@ -29,7 +29,6 @@
def httpbin(*suffix):
"""Returns url for HTTPBIN resource."""
-
return HTTPBIN_URL + '/'.join(suffix)
@@ -77,11 +76,11 @@ def test_path_is_not_double_encoded(self):
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 @@ def test_user_agent_transfers(self):
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 @@ def test_relative_redirect_history(self):
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):
Please sign in to comment.
Something went wrong with that request. Please try again.