Jeremy Cline f4fd5a9
From 7a33a8e523be6aa40c7e5435d3c5d92f2cc6e9a0 Mon Sep 17 00:00:00 2001
Jeremy Cline f4fd5a9
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Jeremy Cline f4fd5a9
Date: Mon, 8 Apr 2019 18:04:22 +0200
Jeremy Cline f4fd5a9
Subject: [PATCH] Support pytest 4
Jeremy Cline f4fd5a9
Jeremy Cline f4fd5a9
Fixes https://github.com/kennethreitz/requests/issues/5048
Jeremy Cline f4fd5a9
Jeremy Cline f4fd5a9
See https://docs.pytest.org/en/latest/deprecations.html#marks-in-pytest-mark-parametrize
Jeremy Cline f4fd5a9
---
Jeremy Cline f4fd5a9
 tests/test_utils.py |  3 ++-
Jeremy Cline f4fd5a9
 1 file changed, 2 insertions(+), 1 deletions(-)
Jeremy Cline f4fd5a9
Jeremy Cline f4fd5a9
diff --git a/tests/test_utils.py b/tests/test_utils.py
Jeremy Cline f4fd5a9
index 59b0b0efa..62c51494d 100644
Jeremy Cline f4fd5a9
--- a/tests/test_utils.py
Jeremy Cline f4fd5a9
+++ b/tests/test_utils.py
Jeremy Cline f4fd5a9
@@ -33,7 +33,8 @@ class TestSuperLen:
Jeremy Cline f4fd5a9
         'stream, value', (
Jeremy Cline f4fd5a9
             (StringIO.StringIO, 'Test'),
Jeremy Cline f4fd5a9
             (BytesIO, b'Test'),
Jeremy Cline f4fd5a9
-            pytest.mark.skipif('cStringIO is None')((cStringIO, 'Test')),
Jeremy Cline f4fd5a9
+            pytest.param(cStringIO, 'Test',
Jeremy Cline f4fd5a9
+                         marks=pytest.mark.skipif('cStringIO is None')),
Jeremy Cline f4fd5a9
         ))
Jeremy Cline f4fd5a9
     def test_io_streams(self, stream, value):
Jeremy Cline f4fd5a9
         """Ensures that we properly deal with different kinds of IO streams."""