diff options
author | Tom Rini <trini@konsulko.com> | 2021-02-02 09:24:10 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-02-02 09:24:10 -0500 |
commit | fdcb93e1709ab1a2ebb562455621617c29e2099c (patch) | |
tree | 7e81a83f46b79862c37614596e0074334269b0b1 /test | |
parent | 1aa9c3b9308763f9b1d3e31a02276baf98245945 (diff) | |
parent | aa8544e0d16ffed53597a99883e0eb1f17818f48 (diff) | |
download | u-boot-fdcb93e1709ab1a2ebb562455621617c29e2099c.zip u-boot-fdcb93e1709ab1a2ebb562455621617c29e2099c.tar.gz u-boot-fdcb93e1709ab1a2ebb562455621617c29e2099c.tar.bz2 |
Merge branch '2021-02-01-assorted-fixes'
- Assorted fixes
Diffstat (limited to 'test')
-rw-r--r-- | test/py/conftest.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/py/conftest.py b/test/py/conftest.py index dc92c0b..9bfd926 100644 --- a/test/py/conftest.py +++ b/test/py/conftest.py @@ -554,7 +554,10 @@ def pytest_runtest_protocol(item, nextitem): """ log.get_and_reset_warning() + ihook = item.ihook + ihook.pytest_runtest_logstart(nodeid=item.nodeid, location=item.location) reports = runtestprotocol(item, nextitem=nextitem) + ihook.pytest_runtest_logfinish(nodeid=item.nodeid, location=item.location) was_warning = log.get_and_reset_warning() # In pytest 3, runtestprotocol() may not call pytest_runtest_setup() if @@ -623,4 +626,4 @@ def pytest_runtest_protocol(item, nextitem): if failure_cleanup: console.cleanup_spawn() - return reports + return True |