From b0b79bf65f5e5e65958090a4a88622b42df896bf Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 21 Jun 2019 09:18:03 +0800 Subject: oeqa: avoid class setup method to run when skipping the whole class For now, even if we have specified to skip the whole module/class via command line, e.g., `oe-selftest -R gotoolchain', the class setup method is still run. This at least results in unnecessary builds, and at worst results in ERROR, if the setup method fails. So improve the skipping mechanism to avoid class setup method to run when specified to skip. Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- meta/lib/oeqa/core/case.py | 2 ++ meta/lib/oeqa/core/context.py | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/meta/lib/oeqa/core/case.py b/meta/lib/oeqa/core/case.py index 54977c809f..aca144e9dc 100644 --- a/meta/lib/oeqa/core/case.py +++ b/meta/lib/oeqa/core/case.py @@ -32,6 +32,8 @@ class OETestCase(unittest.TestCase): @classmethod def _oeSetUpClass(clss): _validate_td_vars(clss.td, clss.td_vars, "class") + if hasattr(clss, 'setUpHooker') and callable(getattr(clss, 'setUpHooker')): + clss.setUpHooker() clss.setUpClassMethod() @classmethod diff --git a/meta/lib/oeqa/core/context.py b/meta/lib/oeqa/core/context.py index 7882697e28..68819cc338 100644 --- a/meta/lib/oeqa/core/context.py +++ b/meta/lib/oeqa/core/context.py @@ -50,10 +50,18 @@ class OETestContext(object): def func(): raise unittest.SkipTest(skipmsg) return func + class_ids = {} for test in self.suites: + if test.__class__ not in class_ids: + class_ids[test.__class__] = '.'.join(test.id().split('.')[:-1]) for skip in skips: if (test.id()+'.').startswith(skip+'.'): setattr(test, 'setUp', skipfuncgen('Skip by the command line argument "%s"' % skip)) + for tclass in class_ids: + cid = class_ids[tclass] + for skip in skips: + if (cid + '.').startswith(skip + '.'): + setattr(tclass, 'setUpHooker', skipfuncgen('Skip by the command line argument "%s"' % skip)) def loadTests(self, module_paths, modules=[], tests=[], modules_manifest="", modules_required=[], filters={}): -- cgit 1.2.3-korg