aboutsummaryrefslogtreecommitdiff
path: root/test/py/conftest.py
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2016-01-22 12:30:09 -0700
committerSimon Glass <sjg@chromium.org>2016-01-28 21:01:23 -0700
commitc10eb9d39fb54f435dbd632f71c760e4a887a015 (patch)
tree987ef025a44ad100c713d5da3e45c13e19ef9964 /test/py/conftest.py
parent636f38d83a7e0e6ca076ae65e086c800337fb3a3 (diff)
downloadu-boot-c10eb9d39fb54f435dbd632f71c760e4a887a015.zip
u-boot-c10eb9d39fb54f435dbd632f71c760e4a887a015.tar.gz
u-boot-c10eb9d39fb54f435dbd632f71c760e4a887a015.tar.bz2
test/py: drain console log at the end of any failed test
Tests may fail for a number of reasons, and in particular for reasons other than a timeout waiting for U-Boot to print expected data. If the last operation that a failed test performs is not waiting for U-Boot to print something, then any trailing output from U-Boot during that test's operation will not be logged as part of that test, but rather either along with the next test, or even thrown away, potentiall hiding clues re: the test failure reason. Solve this by explicitly draining (and hence logging) the U-Boot output in the case of failed tests. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'test/py/conftest.py')
-rw-r--r--test/py/conftest.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/py/conftest.py b/test/py/conftest.py
index 38aa3f9..c1f19ce 100644
--- a/test/py/conftest.py
+++ b/test/py/conftest.py
@@ -386,6 +386,7 @@ def pytest_runtest_protocol(item, nextitem):
skipped = report
if failed:
+ console.drain_console()
tests_failed.add(item.name)
elif skipped:
tests_skipped.add(item.name)