From: Ian Cordasco <ian.cordasco@rackspace.com>
Date: Mon, 1 Dec 2014 22:21:41 +0000 (-0600)
Subject: Update tests to work offline
X-Git-Tag: v2.5.1~10^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cf82d4406be55c71983d05d7f6e18917540b5c69;p=services%2Fpython-requests.git

Update tests to work offline
---

diff --git a/test_requests.py b/test_requests.py
index 4624f09..2d3ee62 100755
--- a/test_requests.py
+++ b/test_requests.py
@@ -258,7 +258,7 @@ class RequestsTestCase(unittest.TestCase):
         """Do not send headers in Session.headers with None values."""
         ses = requests.Session()
         ses.headers['Accept-Encoding'] = None
-        req = requests.Request('GET', 'http://httpbin.org/get')
+        req = requests.Request('GET', httpbin('get'))
         prep = ses.prepare_request(req)
         assert 'Accept-Encoding' not in prep.headers
 
@@ -1008,12 +1008,12 @@ class RequestsTestCase(unittest.TestCase):
         assert s == "Basic dGVzdDp0ZXN0"
 
     def test_requests_history_is_saved(self):
-        r = requests.get('https://httpbin.org/redirect/5')
+        r = requests.get(httpbin('redirect/5'))
         total = r.history[-1].history
         i = 0
         for item in r.history:
             assert item.history == total[0:i]
-            i=i+1
+            i = i + 1
 
     def test_json_param_post_content_type_works(self):
         r = requests.post(
@@ -1350,7 +1350,7 @@ class TestMorselToCookieMaxAge(unittest.TestCase):
 class TestTimeout:
     def test_stream_timeout(self):
         try:
-            requests.get('https://httpbin.org/delay/10', timeout=2.0)
+            requests.get(httpbin('delay/10'), timeout=2.0)
         except requests.exceptions.Timeout as e:
             assert 'Read timed out' in e.args[0].args[0]
 
@@ -1450,7 +1450,7 @@ class TestRedirects:
 
     def test_requests_are_updated_each_time(self):
         session = RedirectSession([303, 307])
-        prep = requests.Request('POST', 'http://httpbin.org/post').prepare()
+        prep = requests.Request('POST', httpbin('post')).prepare()
         r0 = session.send(prep)
         assert r0.request.method == 'POST'
         assert session.calls[-1] == SendCall((r0.request,), {})
@@ -1534,12 +1534,12 @@ def test_prepare_unicode_url():
 def test_urllib3_retries():
     from requests.packages.urllib3.util import Retry
     s = requests.Session()
-    s.mount('https://', HTTPAdapter(max_retries=Retry(
+    s.mount('http://', HTTPAdapter(max_retries=Retry(
         total=2, status_forcelist=[500]
     )))
 
     with pytest.raises(RetryError):
-        s.get('https://httpbin.org/status/500')
+        s.get(httpbin('status/500'))
 
 if __name__ == '__main__':
     unittest.main()