45 lines
1.4 KiB
Diff
45 lines
1.4 KiB
Diff
From e1eee5262b86d046358c2cc1ba1f4b47da0bbc6d 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
|
|
|
|
(cherry picked from commit 7a33a8e523be6aa40c7e5435d3c5d92f2cc6e9a0)
|
|
---
|
|
setup.py | 2 +-
|
|
tests/test_utils.py | 3 ++-
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index 10ce2c62..c26616df 100755
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -54,7 +54,7 @@ test_requirements = [
|
|
'pytest-mock',
|
|
'pytest-xdist',
|
|
'PySocks>=1.5.6, !=1.5.7',
|
|
- 'pytest>=2.8.0'
|
|
+ 'pytest>=3'
|
|
]
|
|
|
|
about = {}
|
|
diff --git a/tests/test_utils.py b/tests/test_utils.py
|
|
index 59b0b0ef..62c51494 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."""
|
|
--
|
|
2.21.0
|