diff options
| author | Stephen Warren <swarren@wwwdotorg.org> | 2021-01-30 20:12:18 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-01 16:33:02 -0500 |
| commit | 372497572b1102153a98bf20b833eb9d470c3805 (patch) | |
| tree | 3613d78c0b5ac26dcbbf658634b440c93fc26708 /test | |
| parent | 9644bd0d01e72b256a2d480999f6e1b86c6e5f34 (diff) | |
| download | u-boot-372497572b1102153a98bf20b833eb9d470c3805.tar.gz u-boot-372497572b1102153a98bf20b833eb9d470c3805.tar.xz u-boot-372497572b1102153a98bf20b833eb9d470c3805.zip | |
test/py: fix runtest wrapper for pytest 6
The implementation of pytest_runtest_protocol() must call
pytest_runtest_logstart() and pytest_runtest_logfinish(). This appears to
be necessary even in pytest 5.2.1 judging by the default version of
pytest_runtest_protocol(), but evidently some form of code reorganization
in pytest only made this have a practical effect in the newer version. I'd
previously been under the impression that 100% of the required work of
pytest_runtest_protocol() was handled by the fact it called
runtestprotocol() as its implementation. However, it appears that custom
implementations do need to do a little more than this.
Reported-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
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 dc92c0be32..9bfd926345 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 |