diff options
author | Kenneth Reitz <me@kennethreitz.org> | 2014-12-02 20:46:10 -0800 |
---|---|---|
committer | Kenneth Reitz <me@kennethreitz.org> | 2014-12-02 20:46:10 -0800 |
commit | 4e90aa7bd0c8051fe4894971fb77c72a26a92728 (patch) | |
tree | ea006787b9b6853855786112a790f10002a42c7c | |
parent | f172b30356d821d180fa4ecfa3e71c7274a32de4 (diff) | |
parent | cf82d4406be55c71983d05d7f6e18917540b5c69 (diff) | |
download | python-requests-4e90aa7bd0c8051fe4894971fb77c72a26a92728.tar.gz |
Merge pull request #2363 from sigmavirus24/fix-tests
Update tests to work offline
-rwxr-xr-x | test_requests.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test_requests.py b/test_requests.py index 4624f095..2d3ee628 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() |