Skip to content

Commit 2e735ad

Browse files
committed
pytest: fix warning with doctests
Fixes > /usr/lib/python3.7/site-packages/_pytest/python.py:764: > RemovedInPytest4Warning: usage of Generator.Function is deprecated, > please use pytest.Function instead
1 parent f5d14bf commit 2e735ad

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

tests/test_doctests.py

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
import six
21
import doctest
3-
from paste.util.import_string import simple_import
42
import os
53

4+
import pytest
5+
import six
6+
7+
from paste.util.import_string import simple_import
8+
69
filenames = [
710
'tests/template.txt',
811
]
@@ -30,29 +33,26 @@
3033
if six.PY3:
3134
options |= doctest.IGNORE_EXCEPTION_DETAIL
3235

33-
def test_doctests():
34-
for filename in filenames:
35-
filename = os.path.join(
36-
os.path.dirname(os.path.dirname(__file__)),
37-
filename)
38-
yield do_doctest, filename
3936

40-
def do_doctest(filename):
37+
@pytest.mark.parametrize('filename', filenames)
38+
def test_doctests(filename):
39+
filename = os.path.join(
40+
os.path.dirname(os.path.dirname(__file__)),
41+
filename)
4142
failure, total = doctest.testfile(
4243
filename, module_relative=False,
4344
optionflags=options)
4445
assert not failure, "Failure in %r" % filename
4546

46-
def test_doctest_mods():
47-
for module in modules:
48-
yield do_doctest_mod, module
4947

50-
def do_doctest_mod(module):
48+
@pytest.mark.parametrize('module', modules)
49+
def test_doctest_mods(module):
5150
module = simple_import(module)
5251
failure, total = doctest.testmod(
5352
module, optionflags=options)
5453
assert not failure, "Failure in %r" % module
5554

55+
5656
if __name__ == '__main__':
5757
import sys
5858
import doctest

0 commit comments

Comments
 (0)