summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into gae-to-pytestgae-to-pytestCory Benfield2017-06-146-555/+510
|\
| * Merge pull request #1218 from alexwlchan/pytest-responseCory Benfield2017-06-141-164/+153
| |\
| | * 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
| |/
| * Merge pull request #1217 from alexwlchan/pytest-retryCory Benfield2017-06-131-93/+78
| |\
| | * Rewrite test_retry.py to be pytest-styleAlex Chan2017-06-131-93/+78
| |/
| * Merge pull request #1216 from alexwlchan/leaky-leakyCory Benfield2017-06-114-2/+13
| |\
| | * 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
| |/
| * Merge pull request #1215 from alexwlchan/pytest-utilsCory Benfield2017-06-101-304/+274
| |\
| | * 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
* | Ugggggggh Python 2.6 you monsterJon Wayne Parrott2017-06-071-1/+1
* | Move app engine tests over to pytestJon Wayne Parrott2017-06-0712-179/+144
|/
* Merge pull request #1204 from alexwlchan/pytest-exceptionsCory Benfield2017-06-071-41/+26
|\
| * Merge branch 'master' into pytest-exceptionsCory Benfield2017-06-076-52/+112
| |\ | |/ |/|
* | Merge pull request #1178 from beniwohli/1112-SSLError-retryCory Benfield2017-06-076-52/+112
|\ \
| * | added note to CHANGES.rst for Pull #1178 / Issue #1112Benjamin Wohlwend2017-06-071-0/+3
| * | added test for retrying SSLError on the socket levelBenjamin Wohlwend2017-06-072-6/+52
| * | Ensured that SSLErrors will be retriedBenjamin Wohlwend2017-06-075-53/+64
|/ /
| * Merge branch 'master' into pytest-exceptionsCory Benfield2017-06-051-49/+41
| |\ | |/ |/|
* | Merge pull request #1206 from alexwlchan/pytest-filepostCory 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
| | |\ | |_|/ |/| |
* | | Merge pull request #1205 from alexwlchan/pytest-fieldsCory 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 pull request #1203 from alexwlchan/pytest-compatibilityCory Benfield2017-06-051-4/+5
|\
| * Merge branch 'master' into pytest-compatibilityCory Benfield2017-06-051-234/+207
| |\ | |/ |/|
* | Merge pull request #1200 from alexwlchan/pytest-connectionpoolCory 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 pull request #1201 from jdufresne/bdistCory Benfield2017-06-041-1/+1
|\
| * Rename [wheel] section to [bdist_wheel] as the former is legacyJon Dufresne2017-06-041-1/+1
|/
* Merge pull request #1202 from jdufresne/versionsCory Benfield2017-06-041-0/+8
|\
| * Add trove classifiers for all supported Python versionsJon Dufresne2017-06-041-0/+8
|/
* Merge pull request #1198 from alexwlchan/pytest-connectionCory Benfield2017-06-031-16/+10
|\
| * Merge branch 'master' into pytest-connectionCory Benfield2017-06-031-39/+29
| |\ | |/ |/|
* | Merge pull request #1197 from alexwlchan/pytest-proxymanagerCory 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
| |/ |/|
View Lorry Controller Status