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 4

We no longer have to maintain pkg-tests-pytest.ini

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-12-07 11:40:14 +00:00 • committed by Daniel Wozniak
parent 89c8d757f5
commit 0f146ef77f
2 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
noxfile.py
View file

@ -1817,7 +1817,9 @@ def ci_test_onedir_pkgs(session):
)
chunks = {
"install": ["tests/pytests/pkg/"],
"install": [
"tests/pytests/pkg/",
],
"upgrade": [
"--upgrade",
"--no-uninstall",
@ -1870,8 +1872,6 @@ def ci_test_onedir_pkgs(session):
pytest_args = (
cmd_args[:]
+ [
"-c",
str(REPO_ROOT / "pkg-tests-pytest.ini"),
f"--junitxml=artifacts/xml-unittests-output/test-results-{chunk}.xml",
f"--log-file=artifacts/logs/runtests-{chunk}.log",
]
@ -1890,8 +1890,6 @@ def ci_test_onedir_pkgs(session):
pytest_args = (
cmd_args[:]
+ [
"-c",
str(REPO_ROOT / "pkg-tests-pytest.ini"),
f"--junitxml=artifacts/xml-unittests-output/test-results-{chunk}-rerun.xml",
f"--log-file=artifacts/logs/runtests-{chunk}-rerun.log",
"--lf",
@ -1911,8 +1909,6 @@ def ci_test_onedir_pkgs(session):
pytest_args = (
cmd_args[:]
+ [
"-c",
str(REPO_ROOT / "pkg-tests-pytest.ini"),
"--no-install",
f"--junitxml=artifacts/xml-unittests-output/test-results-install.xml",
f"--log-file=artifacts/logs/runtests-install.log",
@ -1930,8 +1926,6 @@ def ci_test_onedir_pkgs(session):
pytest_args = (
cmd_args[:]
+ [
"-c",
str(REPO_ROOT / "pkg-tests-pytest.ini"),
"--no-install",
f"--junitxml=artifacts/xml-unittests-output/test-results-install-rerun.xml",
f"--log-file=artifacts/logs/runtests-install-rerun.log",

10
pkg-tests-pytest.ini
View file

@ -1,10 +0,0 @@
[pytest]
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/
testpaths=pkg/tests
python_files=test_*.py
python_classes=Test*
python_functions = test_*
junit_family=xunit2