[oe-commits] [openembedded-core] 29/68: oeqa/runtime/cases/multilib.py: fix test_file_connman skipping logic

[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 55eed10368da6b3179e3ad1ab9322cff32fa99cf
Author: Chen Qi <Qi.Chen at windriver.com>
AuthorDate: Fri Jun 1 13:03:08 2018 +0800

    oeqa/runtime/cases/multilib.py: fix test_file_connman skipping logic
    
    The test_file_connman should be executed only when 'lib32-connman' is
    installed and 'connman' is not installed.
    
    When lib32-connman and connman are both installed, the /usr/sbin/connmand
    could be from connman or lib32-connman, depending on the installation
    order. What we want to check is the connmand command from lib32-connman,
    so we need to make sure that connman is not there to cause chaos.
    
    (From OE-Core rev: bc6839394c06bb695b92b2183337e7381da1e86c)
    
    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/runtime/cases/multilib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/runtime/cases/multilib.py b/meta/lib/oeqa/runtime/cases/multilib.py
index 970f676..8902038 100644
--- a/meta/lib/oeqa/runtime/cases/multilib.py
+++ b/meta/lib/oeqa/runtime/cases/multilib.py
@@ -38,6 +38,6 @@ class MultilibTest(OERuntimeTestCase):
 
     @OETestID(279)
     @OETestDepends(['multilib.MultilibTest.test_check_multilib_libc'])
-    @OEHasPackage(['lib32-connman'])
+    @OEHasPackage(['lib32-connman', '!connman'])
     def test_file_connman(self):
         self.archtest("/usr/sbin/connmand", "ELF32")

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