55 lines
2.4 KiB
Diff
55 lines
2.4 KiB
Diff
From ea99dae0b4b0cfcd232498e8af832874fdaeb983 Mon Sep 17 00:00:00 2001
|
|
From: Fabien Boucher <fboucher@redhat.com>
|
|
Date: Tue, 16 Jun 2020 13:47:17 +0200
|
|
Subject: [PATCH] use pytest.param in parametrize decorator
|
|
|
|
---
|
|
tests/test_util.py | 31 ++++++++++++++++++-------------
|
|
1 file changed, 18 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/tests/test_util.py b/tests/test_util.py
|
|
index 973b81a..81d37c2 100644
|
|
--- a/tests/test_util.py
|
|
+++ b/tests/test_util.py
|
|
@@ -215,20 +215,25 @@ class TestObjToRef(object):
|
|
assert str(exc.value) == 'Cannot create a reference to a nested function'
|
|
|
|
@pytest.mark.parametrize('input,expected', [
|
|
- pytest.mark.skipif(sys.version_info[:2] == (3, 2),
|
|
- reason="Unbound methods can't be resolved on Python 3.2")(
|
|
- (DummyClass.meth, 'tests.test_util:DummyClass.meth')
|
|
- ),
|
|
+ pytest.param(
|
|
+ DummyClass.meth,
|
|
+ 'tests.test_util:DummyClass.meth',
|
|
+ marks=pytest.mark.skipif(
|
|
+ sys.version_info[:2] == (3, 2),
|
|
+ reason="Unbound methods can't be resolved on Python 3.2")),
|
|
(DummyClass.classmeth, 'tests.test_util:DummyClass.classmeth'),
|
|
- pytest.mark.skipif(sys.version_info < (3, 3),
|
|
- reason="Requires __qualname__ (Python 3.3+)")(
|
|
- (DummyClass.InnerDummyClass.innerclassmeth,
|
|
- 'tests.test_util:DummyClass.InnerDummyClass.innerclassmeth')
|
|
- ),
|
|
- pytest.mark.skipif(sys.version_info < (3, 3),
|
|
- reason="Requires __qualname__ (Python 3.3+)")(
|
|
- (DummyClass.staticmeth, 'tests.test_util:DummyClass.staticmeth')
|
|
- ),
|
|
+ pytest.param(
|
|
+ DummyClass.InnerDummyClass.innerclassmeth,
|
|
+ 'tests.test_util:DummyClass.InnerDummyClass.innerclassmeth',
|
|
+ marks=pytest.mark.skipif(
|
|
+ sys.version_info < (3, 3),
|
|
+ reason="Requires __qualname__ (Python 3.3+)")),
|
|
+ pytest.param(
|
|
+ DummyClass.staticmeth,
|
|
+ 'tests.test_util:DummyClass.staticmeth',
|
|
+ marks=pytest.mark.skipif(
|
|
+ sys.version_info < (3, 3),
|
|
+ reason="Requires __qualname__ (Python 3.3+)")),
|
|
(timedelta, 'datetime:timedelta'),
|
|
], ids=['unbound method', 'class method', 'inner class method', 'static method', 'timedelta'])
|
|
def test_valid_refs(self, input, expected):
|
|
--
|
|
2.25.4
|
|
|