| From dc75b3ca0b4c95648eb07b92cb414394d99c13a0 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz> |
| Date: Mon, 8 Apr 2019 18:04:22 +0200 |
| Subject: [PATCH] Support pytest 4 |
| |
| Fixes https://github.com/kennethreitz/requests/issues/5048 |
| |
| See https://docs.pytest.org/en/latest/deprecations.html#marks-in-pytest-mark-parametrize |
| --- |
| setup.py | 2 +- |
| tests/test_utils.py | 3 ++- |
| 2 files changed, 3 insertions(+), 2 deletions(-) |
| |
| diff --git a/tests/test_utils.py b/tests/test_utils.py |
| index 59b0b0efa..62c51494d 100644 |
| --- a/tests/test_utils.py |
| +++ b/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.""" |