summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-06-01 13:03:05 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-04 15:15:00 +0100
commit395108faaca97bb18af5e73f7b84228e518ff8ee (patch)
tree5a6d7d64a8b8422cffd9a0b0cc9e935975a4f42f
parentd478a26e5f2b19568a8c27a217a6fb0eec98e193 (diff)
downloadpoky-395108faaca97bb18af5e73f7b84228e518ff8ee.tar.gz
oeqa/core/decorator/data.py: fix skipIfNotInDataVar
The var might not be set, resulting in unexpected error. RESULTS - multilib.MultilibTest.test_check_multilib_libc - Testcase 1593: ERROR The above error is due to MULTILIBS being not set, which is the default for OE. This patch fixes this problem. Also, the debugging message in skipIfNotInDataVar is currently confusing. Instead of DEBUG: Checking if 'MULTILIBS' value is in 'multilib:lib32' to run the test it should be DEBUG: Checking if 'MULTILIBS' value contains 'multilib:lib32' to run the test This patch also fixes it. (From OE-Core rev: 3f5c678664a2bba43d99508779dc2ce227cf52a2) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/core/decorator/data.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/core/decorator/data.py b/meta/lib/oeqa/core/decorator/data.py
index ff7bdd98b7..31c6dd6be7 100644
--- a/meta/lib/oeqa/core/decorator/data.py
+++ b/meta/lib/oeqa/core/decorator/data.py
@@ -61,10 +61,10 @@ class skipIfNotInDataVar(OETestDecorator):
61 61
62 attrs = ('var', 'value', 'msg') 62 attrs = ('var', 'value', 'msg')
63 def setUpDecorator(self): 63 def setUpDecorator(self):
64 msg = ('Checking if %r value is in %r to run ' 64 msg = ('Checking if %r value contains %r to run '
65 'the test' % (self.var, self.value)) 65 'the test' % (self.var, self.value))
66 self.logger.debug(msg) 66 self.logger.debug(msg)
67 if not self.value in self.case.td.get(self.var): 67 if not self.value in (self.case.td.get(self.var) or ""):
68 self.case.skipTest(self.msg) 68 self.case.skipTest(self.msg)
69 69
70@registerDecorator 70@registerDecorator