upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9.18] fix: test: minor fixes for extra_artifacts detection

Browse source 
Some omissions of !9426 discovered during the backports

Backport of MR !9739

Merge branch 'backport-nicki/extra-artifacts-fixups-9.18' into 'bind-9.18'

See merge request isc-projects/bind9!9742
This commit is contained in:
Nicki Křížek 2024-11-12 12:26:13 +00:00
commit 4ae908d05b
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
bin/tests/system/conftest.py
View file

@ -168,16 +168,25 @@ def pytest_collection_modifyitems(items):
class NodeResult:
def __init__(self, report=None):
self.outcome = None
self.messages = []
self._outcomes = {}
self.messages = {}
if report is not None:
self.update(report)
def update(self, report):
if self.outcome is None or report.outcome != "passed":
self.outcome = report.outcome
if report.longreprtext:
self.messages.append(report.longreprtext)
# Allow the same nodeid/when to be overriden. This only happens when
# the test is re-run with flaky plugin. In that case, we want the
# latest result to override any previous results.
key = (report.nodeid, report.when)
self._outcomes[key] = report.outcome
self.messages[key] = report.longreprtext
@property
def outcome(self):
for outcome in self._outcomes.values():
if outcome != "passed":
return outcome
return "passed"
@pytest.hookimpl(tryfirst=True, hookwrapper=True)
@ -396,7 +405,7 @@ def system_test_dir(request, env, system_test_name, expected_artifacts):
messages = []
for node, result in test_results.items():
isctest.log.debug("%s %s", result.outcome.upper(), node)
messages.extend(result.messages)
messages.extend(result.messages.values())
for message in messages:
isctest.log.debug("\n" + message)
failed = any(res.outcome == "failed" for res in test_results.values())