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

Drop the old py.test call in favour of the new pytest call

Browse source
This commit is contained in:
Pedro Algarvio 2020-04-08 13:34:59 +01:00
parent 5ed944ab07
commit a5b2b6c350
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
noxfile.py
View file

@ -889,9 +889,9 @@ def _pytest(session, coverage, cmd_args):
try:
if coverage is True:
_run_with_coverage(session, "coverage", "run", "-m", "py.test", *cmd_args)
_run_with_coverage(session, "coverage", "run", "-m", "pytest", *cmd_args)
else:
session.run("py.test", *cmd_args, env=env)
session.run("pytest", *cmd_args, env=env)
except CommandFailed: # pylint: disable=try-except-raise
# Not rerunning failed tests for now
raise
@ -905,9 +905,9 @@ def _pytest(session, coverage, cmd_args):
cmd_args[idx] = parg.replace(".xml", "-rerun-failed.xml")
cmd_args.append("--lf")
if coverage is True:
_run_with_coverage(session, "coverage", "run", "-m", "py.test", *cmd_args)
_run_with_coverage(session, "coverage", "run", "-m", "pytest", *cmd_args)
else:
session.run("py.test", *cmd_args, env=env)
session.run("pytest", *cmd_args, env=env)
# pylint: enable=unreachable