MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

oeqa/selftest/bblogging: Add logging tests for bb.build.exec_func with shell/python code

Browse Source 
The situation regarding logging is different when a function called by
bb.build.exec_func() fails compared to when the task code fails
directly. There is a recent fix in bitbake to solve that and these
tests will hopefully prevent regressions.

(From OE-Core rev: 50ccfaa8b3ed340ee7f906934b211a1c73eb8db5)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Kjellerstedt 2022-02-17 18:14:15 +01:00 committed by Richard Purdie
parent 528686b980
commit 42243c9e22
2 changed files with 78 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meta-selftest/recipes-test/logging-test/logging-test.bb
View File

@ -11,12 +11,22 @@ do_shelltest() {
}
addtask do_shelltest
python do_pythontest_exec_func_shell() {
bb.build.exec_func('do_shelltest', d)
}
addtask do_pythontest_exec_func_shell
python do_pythontest_exit () {
print("This is python stdout")
sys.exit(1)
}
addtask do_pythontest_exit
python do_pythontest_exec_func_python() {
bb.build.exec_func('do_pythontest_exit', d)
}
addtask do_pythontest_exec_func_python
python do_pythontest_fatal () {
print("This is python fatal test stdout")
bb.fatal("This is a fatal error")

69
meta/lib/oeqa/selftest/cases/bblogging.py
View File

@ -30,7 +30,7 @@ class BitBakeLogging(OESelftestTestCase):
self.write_config('BBINCLUDELOGS = ""')
result = bitbake("logging-test -c shelltest -f -v", ignore_status = True)
self.assertIn("ERROR: Logfile of failure stored in:", result.output)
# two copies due to set +x
# two copies due to set +x
self.assertCount(result.output, "This is shell stdout", 2)
self.assertCount(result.output, "This is shell stderr", 2)
@ -42,6 +42,41 @@ class BitBakeLogging(OESelftestTestCase):
self.assertCount(result.output, "This is shell stdout", 2)
self.assertCount(result.output, "This is shell stderr", 2)
def test_python_exec_func_shell_logging(self):
# no logs, no verbose
self.write_config('BBINCLUDELOGS = ""')
result = bitbake("logging-test -c pythontest_exec_func_shell -f",
ignore_status = True)
self.assertIn("ERROR: Logfile of failure stored in:", result.output)
self.assertNotIn("This is shell stdout", result.output)
self.assertNotIn("This is shell stderr", result.output)
# logs, no verbose
self.write_config('BBINCLUDELOGS = "yes"')
result = bitbake("logging-test -c pythontest_exec_func_shell -f",
ignore_status = True)
self.assertIn("ERROR: Logfile of failure stored in:", result.output)
self.assertCount(result.output, "This is shell stdout", 1)
self.assertCount(result.output, "This is shell stderr", 1)
# no logs, verbose
self.write_config('BBINCLUDELOGS = ""')
result = bitbake("logging-test -c pythontest_exec_func_shell -f -v",
ignore_status = True)
self.assertIn("ERROR: Logfile of failure stored in:", result.output)
# two copies due to set +x
self.assertCount(result.output, "This is shell stdout", 2)
self.assertCount(result.output, "This is shell stderr", 2)
# logs, verbose
self.write_config('BBINCLUDELOGS = "yes"')
result = bitbake("logging-test -c pythontest_exec_func_shell -f -v",
ignore_status = True)
self.assertIn("ERROR: Logfile of failure stored in:", result.output)
# two copies due to set +x
self.assertCount(result.output, "This is shell stdout", 2)
self.assertCount(result.output, "This is shell stderr", 2)
def test_python_exit_logging(self):
# no logs, no verbose
self.write_config('BBINCLUDELOGS = ""')
@ -70,6 +105,38 @@ class BitBakeLogging(OESelftestTestCase):
# python tasks don't log output with -v currently
#self.assertCount(result.output, "This is python stdout", 1)
def test_python_exec_func_python_logging(self):
# no logs, no verbose
self.write_config('BBINCLUDELOGS = ""')
result = bitbake("logging-test -c pythontest_exec_func_python -f",
ignore_status = True)
self.assertIn("ERROR: Logfile of failure stored in:", result.output)
self.assertNotIn("This is python stdout", result.output)
# logs, no verbose
self.write_config('BBINCLUDELOGS = "yes"')
result = bitbake("logging-test -c pythontest_exec_func_python -f",
ignore_status = True)
self.assertIn("ERROR: Logfile of failure stored in:", result.output)
# A sys.exit() should include the output
self.assertCount(result.output, "This is python stdout", 1)
# no logs, verbose
self.write_config('BBINCLUDELOGS = ""')
result = bitbake("logging-test -c pythontest_exec_func_python -f -v",
ignore_status = True)
self.assertIn("ERROR: Logfile of failure stored in:", result.output)
# python tasks don't log output with -v currently
#self.assertCount(result.output, "This is python stdout", 1)
# logs, verbose
self.write_config('BBINCLUDELOGS = "yes"')
result = bitbake("logging-test -c pythontest_exec_func_python -f -v",
ignore_status = True)
self.assertIn("ERROR: Logfile of failure stored in:", result.output)
# python tasks don't log output with -v currently
#self.assertCount(result.output, "This is python stdout", 1)
def test_python_fatal_logging(self):
# no logs, no verbose
self.write_config('BBINCLUDELOGS = ""')