diff options
| author |   Chen Qi <Qi.Chen@windriver.com> | 2019-06-14 14:32:18 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-14 22:47:43 +0100 |
| commit | 785bb108ceb9dc137ec8d75d887b6a3869cbfb9c (patch) | |
| tree | c3d87172195215a95dc39b46d6a62798ee0281a3 | |
| parent | 70a30872bd93cc058b05d9cf2b4f9334658629ee (diff) | |
| download | openembedded-core-contrib-785bb108ceb9dc137ec8d75d887b6a3869cbfb9c.tar.gz | |
oescripts.py: avoid error when cairo module is not available
When running 'oe-selftest -r oescripts', the following error appeared.
cls.skipTest('Python module cairo is not present')
TypeError: skipTest() missing 1 required positional argument: 'reason'
This is because the host does not have the cairo python module installed.
Fix this problem by using unittest's SkipTest exception.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/oescripts.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index 217afe3775..7770b66a26 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -3,6 +3,7 @@ # import os +import unittest from oeqa.selftest.case import OESelftestTestCase from oeqa.selftest.cases.buildhistory import BuildhistoryBase from oeqa.utils.commands import Command, runCmd, bitbake, get_bb_var, get_test_layer @@ -38,7 +39,7 @@ class OEScriptTests(OESelftestTestCase): try: import cairo except ImportError: - cls.skipTest('Python module cairo is not present') + raise unittest.SkipTest('Python module cairo is not present') bitbake("core-image-minimal -c rootfs -f") cls.tmpdir = get_bb_var('TMPDIR') cls.buildstats = cls.tmpdir + "/buildstats/" + sorted(os.listdir(cls.tmpdir + "/buildstats"))[-1] |