Merge pull request #5049 from hroncok/pytest4

Support pytest 4
psf · Aug 20, 2019 · 0fe6653 · 0fe6653
2 parents dd15e52 + dc75b3c
commit 0fe6653
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -54,7 +54,7 @@ def run_tests(self):
     '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
@@ -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."""