From 9d2c1eef7b2dcace5b41edf0143c5a441c838a83 Mon Sep 17 00:00:00 2001 From: Lee Chee Yang Date: Wed, 1 Jul 2020 22:39:08 +0800 Subject: oeqa/core/loader: refine regex to find module test case in format .. this is clear when test cases is only 3 item deep. but confused when it is 4 item deep, eg, oelib.types.TestList.test_list_nosep in this case, oelib and oelib.types can both be treated as module since module name contains only lower cases and class name should contain atleast one upper case. so, always treat leading item without upper case as module also allow module name to contain dot. [YOCTO #13941] (From OE-Core rev: 838646da741cda2059ee2bd64fd1e59980fbf945) Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie (cherry picked from commit ad81ea90a815389e45ff302a85151724c71f71c3) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/lib/oeqa/core/loader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/lib') diff --git a/meta/lib/oeqa/core/loader.py b/meta/lib/oeqa/core/loader.py index 0d7970d49e..73c5788508 100644 --- a/meta/lib/oeqa/core/loader.py +++ b/meta/lib/oeqa/core/loader.py @@ -46,7 +46,7 @@ def _built_modules_dict(modules): for module in modules: # Assumption: package and module names do not contain upper case # characters, whereas class names do - m = re.match(r'^(\w+)(?:\.(\w[^.]*)(?:\.([^.]+))?)?$', module, flags=re.ASCII) + m = re.match(r'^([1-2a-z_.]+)(?:\.(\w[^.]*)(?:\.([^.]+))?)?$', module, flags=re.ASCII) if not m: continue -- cgit v1.2.3-54-g00ecf