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