diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2017-12-21 18:47:09 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-14 09:11:57 +0000 |
| commit | 598a4e9e85467bafc85b6b801d9e5a01322d7824 (patch) | |
| tree | c1527b6897555263c9b5a91ccc8febe31276cd60 | |
| parent | fca4b2e136209cdf82e3ef748139e1225efeca51 (diff) | |
| download | poky-598a4e9e85467bafc85b6b801d9e5a01322d7824.tar.gz | |
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]
(From OE-Core rev: 695b234ea4f034d428f8cffacceabc2b8f00bc74)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/devtool.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 6989de939e..67df581943 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py | |||
| @@ -174,7 +174,7 @@ class DevtoolTests(DevtoolBase): | |||
| 174 | def test_create_workspace(self): | 174 | def test_create_workspace(self): |
| 175 | # Check preconditions | 175 | # Check preconditions |
| 176 | result = runCmd('bitbake-layers show-layers') | 176 | result = runCmd('bitbake-layers show-layers') |
| 177 | self.assertTrue('/workspace' not in result.output, 'This test cannot be run with a workspace layer in bblayers.conf') | 177 | self.assertTrue('\nworkspace' not in result.output, 'This test cannot be run with a workspace layer in bblayers.conf') |
| 178 | # Try creating a workspace layer with a specific path | 178 | # Try creating a workspace layer with a specific path |
| 179 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') | 179 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') |
| 180 | self.track_for_cleanup(tempdir) | 180 | self.track_for_cleanup(tempdir) |