diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_ext_apidoc.py | 13 | ||||
| -rw-r--r-- | tests/test_setup_command.py | 5 |
2 files changed, 5 insertions, 13 deletions
diff --git a/tests/test_ext_apidoc.py b/tests/test_ext_apidoc.py index ee21f8ffd..2d427417b 100644 --- a/tests/test_ext_apidoc.py +++ b/tests/test_ext_apidoc.py @@ -22,18 +22,13 @@ def apidoc(rootdir, tempdir, apidoc_params): @pytest.fixture def apidoc_params(request): - 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 = {} - if markers is not None: - for info in reversed(list(markers)): - for i, a in enumerate(info.args): - pargs[i] = a - kwargs.update(info.kwargs) + for info in reversed(list(request.node.iter_markers("apidoc"))): + for i, a in enumerate(info.args): + pargs[i] = a + kwargs.update(info.kwargs) args = [pargs[i] for i in sorted(pargs.keys())] return args, kwargs diff --git a/tests/test_setup_command.py b/tests/test_setup_command.py index a56f9d4a3..ef364676c 100644 --- a/tests/test_setup_command.py +++ b/tests/test_setup_command.py @@ -18,10 +18,7 @@ def setup_command(request, tempdir, rootdir): Run `setup.py build_sphinx` with args and kwargs, pass it to the test and clean up properly. """ - if hasattr(request.node, 'get_closest_marker'): # pytest-3.6.0 or newer - marker = request.node.get_closest_marker('setup_command') - else: - marker = request.node.get_marker('setup_command') + marker = request.node.get_closest_marker('setup_command') args = marker.args if marker else [] pkgrootdir = tempdir / 'test-setup' |