[oe-commits] [openembedded-core] 26/68: oeqa/core/decorator/data.py: fix skipIfNotInDataVar

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch sumo
in repository openembedded-core.

commit ea84439d42b578237d03d876992511eec73c5511
Author: Chen Qi <Qi.Chen at windriver.com>
AuthorDate: Fri Jun 1 13:03:05 2018 +0800

    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 at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/lib/oeqa/core/decorator/data.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oeqa/core/decorator/data.py b/meta/lib/oeqa/core/decorator/data.py
index ff7bdd9..31c6dd6 100644
--- a/meta/lib/oeqa/core/decorator/data.py
+++ b/meta/lib/oeqa/core/decorator/data.py
@@ -61,10 +61,10 @@ class skipIfNotInDataVar(OETestDecorator):
 
     attrs = ('var', 'value', 'msg')
     def setUpDecorator(self):
-        msg = ('Checking if %r value is in %r to run '
+        msg = ('Checking if %r value contains %r to run '
               'the test' % (self.var, self.value))
         self.logger.debug(msg)
-        if not self.value in self.case.td.get(self.var):
+        if not self.value in (self.case.td.get(self.var) or ""):
             self.case.skipTest(self.msg)
 
 @registerDecorator

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.