jjb/jenkins-job-builder
Code Issues Proposed changes

Tests: Do not check output if there are no output files

Browse Source 
Some test check for error raising. If it is not raised, test should
file on that, not on expected output mismatch (not empty).

Change-Id: I6c3db840b7ee250ceb1042ca2ddf6d2195b4d547
This commit is contained in:
Vsevolod Fedorov 2022-12-21 11:30:59 +03:00
parent 0991dd64e6
commit d54b331413
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/conftest.py
View File

@ -100,6 +100,9 @@ def project(input, registry):
@pytest.fixture
def expected_output(scenario):
if not scenario.out_paths:
# Do not check output if there are no files for it.
return None
return "".join(path.read_text() for path in sorted(scenario.out_paths))
@ -161,6 +164,8 @@ def check_job(scenario, expected_output, jjb_config, registry):
.strip()
.replace("\n\n", "\n")
)
if expected_output is None:
return
stripped_expected_output = (
expected_output.strip().replace("<BLANKLINE>", "").replace("\n\n", "\n")
)
@ -186,6 +191,8 @@ def check_view(scenario, expected_output, jjb_config, registry):
.strip()
.replace("\n\n", "\n")
)
if expected_output is None:
return
stripped_expected_output = (
expected_output.strip().replace("<BLANKLINE>", "").replace("\n\n", "\n")
)