[oe-commits] [openembedded-core] 07/20: selftest/cases/devtool.py: fix workspace layer checking

[git at git.openembedded.org]

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

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

commit 0970dfaddf511983a36a5a50541cb67063649454
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Thu Dec 21 18:47:09 2017 +0800

    selftest/cases/devtool.py: fix workspace layer checking
    
    Fixed:
    $ oe-selftest -r devtool.DevtoolTests.test_create_workspace
    [snip]
    2017-12-20 18:28:59,404 - oe-selftest - INFO - Traceback (most recent call last):
      File "/workspace2/lyang1/poky/meta/lib/oeqa/core/decorator/__init__.py", line 32, in wrapped_f
        return func(*args, **kwargs)
      File "/workspace2/lyang1/poky/meta/lib/oeqa/selftest/cases/devtool.py", line 177, in test_create_workspace
        self.assertTrue('/workspace' not in result.output, 'This test cannot be run with a workspace layer in bblayers.conf')
    AssertionError: False is not true : This test cannot be run with a workspace layer in bblayers.conf
    [snip]
    
    $ bitbake-layers show-layers
    NOTE: Starting bitbake server...
    layer                 path                                      priority
    ==========================================================================
    meta                  /workspace2/lyang1/poky/meta              5
    meta-poky             /workspace2/lyang1/poky/meta-poky         5
    meta-yocto-bsp        /workspace2/lyang1/poky/meta-yocto-bsp    5
    meta-selftest         /workspace2/lyang1/poky/meta-selftest     5
    
    There is no workspace layer, but I'm in /workspace2, this patch can fix the problem.
    
    [YOCTO #12442]
    
    Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index 6989de9..67df581 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -174,7 +174,7 @@ class DevtoolTests(DevtoolBase):
     def test_create_workspace(self):
         # Check preconditions
         result = runCmd('bitbake-layers show-layers')
-        self.assertTrue('/workspace' not in result.output, 'This test cannot be run with a workspace layer in bblayers.conf')
+        self.assertTrue('\nworkspace' not in result.output, 'This test cannot be run with a workspace layer in bblayers.conf')
         # Try creating a workspace layer with a specific path
         tempdir = tempfile.mkdtemp(prefix='devtoolqa')
         self.track_for_cleanup(tempdir)

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