diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-06-01 14:39:43 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-06-07 01:22:55 +0900 |
| commit | fb41dcefab5e00ab8022f543bfc84f111b7a38b5 (patch) | |
| tree | 2fb85e58be770621cb4236ae33cac6c18948c373 /tests/test_ext_apidoc.py | |
| parent | 88cbd6a5975ce089de9f85b9bec3820aad9b37f7 (diff) | |
| download | sphinx-git-fb41dcefab5e00ab8022f543bfc84f111b7a38b5.tar.gz | |
Fix sphinx.testing uses deprecated pytest API; Node.get_marker(name)
Diffstat (limited to 'tests/test_ext_apidoc.py')
| -rw-r--r-- | tests/test_ext_apidoc.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/test_ext_apidoc.py b/tests/test_ext_apidoc.py index d3d61d1e0..8c81a6e12 100644 --- a/tests/test_ext_apidoc.py +++ b/tests/test_ext_apidoc.py @@ -32,7 +32,10 @@ def apidoc(rootdir, tempdir, apidoc_params): @pytest.fixture def apidoc_params(request): - markers = request.node.get_marker("apidoc") + if hasattr(request.node, 'iter_markers'): # pytest-3.6.0 or newer + markers = request.node.iter_markers("apidoc") + else: + markers = request.node.get_marker("apidoc") pargs = {} kwargs = {} |