Kai Knoblich
ec53ec9286
* Backport a patch from upstream that fixes the unittests in conjunction with devel/py-pytest >= 4. * Remove obsolete CONFLICTS_INSTALL entry as www/py-requests1 no longer exists in the Ports tree. This update includes a pinned urllib3 version bump to < 1.26, which clears the way for a net/urllib3 update to 1.25.6 [1]. Changelog: https://github.com/requests/requests/blob/v2.22.0/HISTORY.md PR: 239302, 229322 [1] Submitted by: swills (based on) Approved by: koobs (maintainer) MFH: 2019Q4
18 lines
690 B
Python
18 lines
690 B
Python
Make tests work with devel/py-pytest >= 4
|
|
|
|
Obtained from:
|
|
https://github.com/psf/requests/commit/0fe6653eabc3e0a4b8c48e374fb7ee83a3bf829b
|
|
|
|
--- tests/test_utils.py.orig 2019-05-16 14:18:16 UTC
|
|
+++ tests/test_utils.py
|
|
@@ -33,7 +33,8 @@ class TestSuperLen:
|
|
'stream, value', (
|
|
(StringIO.StringIO, 'Test'),
|
|
(BytesIO, b'Test'),
|
|
- pytest.mark.skipif('cStringIO is None')((cStringIO, 'Test')),
|
|
+ pytest.param(cStringIO, 'Test',
|
|
+ marks=pytest.mark.skipif('cStringIO is None')),
|
|
))
|
|
def test_io_streams(self, stream, value):
|
|
"""Ensures that we properly deal with different kinds of IO streams."""
|