summaryrefslogtreecommitdiff
path: root/test
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into gae-to-pytestgae-to-pytestCory Benfield2017-06-146-555/+510
|\
| * Once more, with feelingAlex Chan2017-06-141-1/+4
| * HTTPResponse is only a context manager in Python 3Alex Chan2017-06-141-1/+4
| * Rewrite test_response.py to be pytest-styleAlex Chan2017-06-141-164/+147
| * Rewrite test_retry.py to be pytest-styleAlex Chan2017-06-131-93/+78
| * And an unclosed socket in test_socks.pyAlex Chan2017-06-111-0/+1
| * Clean up the socket and the HTTPResponseAlex Chan2017-06-111-0/+2
| * Two more in test_socks.pyAlex Chan2017-06-111-0/+2
| * Clean up a few more leaked FDs in testsAlex Chan2017-06-113-2/+8
| * CasingAlex Chan2017-06-091-7/+7
| * Dicts are out, lists are inAlex Chan2017-06-091-86/+86
| * Rewrite test_utils.py to be pytest-styleAlex Chan2017-06-091-299/+269
* | Address review commentsJon Wayne Parrott2017-06-082-6/+14
* | Move app engine tests over to pytestJon Wayne Parrott2017-06-077-164/+138
|/
* Merge branch 'master' into pytest-exceptionsCory Benfield2017-06-074-35/+103
|\
| * added test for retrying SSLError on the socket levelBenjamin Wohlwend2017-06-072-6/+52
| * Ensured that SSLErrors will be retriedBenjamin Wohlwend2017-06-074-36/+58
* | Merge branch 'master' into pytest-exceptionsCory Benfield2017-06-051-49/+41
|\ \ | |/
| * Merge branch 'master' into pytest-filepostCory Benfield2017-06-051-21/+21
| |\
| * | Rewrite test_filepost.py to be pytest-styleAlex Chan2017-06-051-49/+41
* | | Merge branch 'master' into pytest-exceptionsCory Benfield2017-06-051-21/+21
|\ \ \ | | |/ | |/|
| * | A bit more parameterisationAlex Chan2017-06-051-4/+7
| * | Rewrite test_fields.py to be pytest-styleAlex Chan2017-06-051-20/+17
| |/
* | Make the check in test_exceptions.py a little strongerAlex Chan2017-06-051-1/+2
* | Rewrite test_exceptions.py to be pytest-styleAlex Chan2017-06-051-38/+22
|/
* Merge branch 'master' into pytest-compatibilityCory Benfield2017-06-051-234/+207
|\
| * Rewrite test_connectionpool.py to be pytest-styleAlex Chan2017-06-051-234/+207
* | Rewrite test_compatibility.py to be pytest-styleAlex Chan2017-06-051-4/+5
|/
* Merge branch 'master' into pytest-connectionCory Benfield2017-06-031-39/+29
|\
| * Merge branch 'master' into pytest-proxymanagerIan Cordasco2017-06-021-172/+176
| |\
| * | Rewrite test_proxymanager.py to be pytest-styleAlex Chan2017-06-021-39/+29
* | | Rewrite test_connection.py to be pytest-styleAlex Chan2017-06-031-16/+10
| |/ |/|
* | Rewrite test_collections.py to be pytest-styleAlex Chan2017-06-021-172/+176
|/
* Okay just patch the warnings moduleAlex Chan2017-06-011-7/+8
* Get the warning to fire every timeAlex Chan2017-06-011-1/+3
* Don't warn about missing SNI in the testsAlex Chan2017-06-011-15/+4
* Remove dead test code -- the test only runs on >=2.7.9Alex Chan2017-06-011-8/+1
* Add cleanup code to the dummyserver testsAlex Chan2017-05-303-0/+28
* Fix GAE buildJon Wayne Parrott2017-05-281-1/+1
* Add assert_hostname/assert_fingerprint to list of valid keys for PoolManagerDavanum Srinivas2017-04-301-0/+10
* Failing test for #1165Cory Benfield2017-04-281-0/+20
* Merge branch 'master' into secure-transportCory Benfield2017-04-218-97/+255
|\
| * Add 'status' counter for 'status_forcelist'Tuukka Mustonen2017-04-151-2/+16
| * Add comment about try-catch strategySeth M. Larson2017-04-031-1/+7
| * except NameError:Seth M. Larson2017-04-031-2/+2
| * Also skip timing for selector testing on AppVeyor.Seth M. Larson2017-04-011-3/+4
| * Skip TLS test on Windows py26, fix lint issuesSeth Michael Larson2017-04-014-3/+19
| * socket.error is not a subclass of OSError in Python 2Seth M. Larson2017-04-011-1/+4
| * WinError isn't a subclass of OSError <3.3Seth M. Larson2017-03-311-1/+1
| * Actually use _CONNECT_ERRORSeth M. Larson2017-03-311-1/+1