mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 09:40:20 +00:00
Use a different pytest.ini
file for the package tests
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
parent
5843cb54eb
commit
5c88202087
2 changed files with 17 additions and 3 deletions
10
noxfile.py
10
noxfile.py
|
@ -1789,18 +1789,18 @@ def test_pkgs_onedir(session):
|
|||
chunks = {
|
||||
"install": ["pkg/tests/"],
|
||||
"upgrade": [
|
||||
"pkg/tests/upgrade/test_salt_upgrade.py::test_salt_upgrade",
|
||||
"--upgrade",
|
||||
"--no-uninstall",
|
||||
"pkg/tests/upgrade/",
|
||||
],
|
||||
"upgrade-classic": [
|
||||
"pkg/tests/upgrade/test_salt_upgrade.py::test_salt_upgrade",
|
||||
"--upgrade",
|
||||
"--no-uninstall",
|
||||
"pkg/tests/upgrade/",
|
||||
],
|
||||
"download-pkgs": [
|
||||
"--download-pkgs",
|
||||
"pkg/tests/download/test_pkg_download.py",
|
||||
"pkg/tests/download/",
|
||||
],
|
||||
}
|
||||
|
||||
|
@ -1848,6 +1848,8 @@ def test_pkgs_onedir(session):
|
|||
pytest_args = (
|
||||
cmd_args[:]
|
||||
+ [
|
||||
"-c",
|
||||
str(REPO_ROOT / "pkg-tests-pytest.ini"),
|
||||
f"--junitxml=artifacts/xml-unittests-output/{junit_report_filename}.xml",
|
||||
f"--log-file=artifacts/logs/{runtests_log_filename}.log",
|
||||
]
|
||||
|
@ -1859,6 +1861,8 @@ def test_pkgs_onedir(session):
|
|||
pytest_args = (
|
||||
cmd_args[:]
|
||||
+ [
|
||||
"-c",
|
||||
str(REPO_ROOT / "pkg-tests-pytest.ini"),
|
||||
"--no-install",
|
||||
f"--junitxml=artifacts/xml-unittests-output/{junit_report_filename}.xml",
|
||||
f"--log-file=artifacts/logs/{runtests_log_filename}.log",
|
||||
|
|
10
pkg-tests-pytest.ini
Normal file
10
pkg-tests-pytest.ini
Normal file
|
@ -0,0 +1,10 @@
|
|||
[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
|
Loading…
Add table
Reference in a new issue