saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move static norecursedirs to pytest.ini

Browse source
This commit is contained in:
Pedro Algarvio 2020-04-09 06:42:25 +01:00 • committed by Daniel Wozniak
parent 0c12750c3f
commit 8d81f62452
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pytest.ini
View file

@ -3,3 +3,4 @@ log_print=false
log_date_format=%H:%M:%S
log_cli_format=%(asctime)s,%(msecs)03.0f [%(name)-5s:%(lineno)-4d][%(levelname)-8s][%(processName)s(%(process)s)] %(message)s
log_file_format=%(asctime)s,%(msecs)03d [%(name)-17s:%(lineno)-4d][%(levelname)-8s][%(processName)s(%(process)d)] %(message)s
norecursedirs=templates tests/kitchen tests/utils tests/support

6
tests/conftest.py
View file

@ -8,7 +8,7 @@
Prepare py.test for our test suite
"""
# pylint: disable=wrong-import-order,wrong-import-position,3rd-party-local-module-not-gated
# pylint: disable=redefined-outer-name,invalid-name
# pylint: disable=redefined-outer-name,invalid-name,3rd-party-module-not-gated
# Import python libs
from __future__ import absolute_import, print_function, unicode_literals
@ -249,10 +249,6 @@ def pytest_configure(config):
if dirname != "tests":
config.addinivalue_line("norecursedirs", os.path.join(CODE_DIR, dirname))
config.addinivalue_line("norecursedirs", os.path.join(CODE_DIR, "templates"))
config.addinivalue_line("norecursedirs", os.path.join(CODE_DIR, "tests/kitchen"))
config.addinivalue_line("norecursedirs", os.path.join(CODE_DIR, "tests/support"))
# Expose the markers we use to pytest CLI
config.addinivalue_line(
"markers",