From: Mariano Lopez Date: Mon, 27 Feb 2017 07:45:01 +0000 (+0000) Subject: oeqa/core/loader.py: Avoid importing tests with built-ins name X-Git-Tag: uninative-1.5~101 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=d9548f981448307b042807373e469f0d0b110bfe;p=openembedded-core.git oeqa/core/loader.py: Avoid importing tests with built-ins name If importing a test with the same name as a built-in module, it will silently import the built-in and check for tests in built-in module. This happened with syslog module in debian based machines, so add a raise to avoid this behavior. [YOCTO #10978] Signed-off-by: Mariano Lopez Signed-off-by: Ross Burton --- diff --git a/meta/lib/oeqa/core/loader.py b/meta/lib/oeqa/core/loader.py index b9ba9235af..74f1117825 100644 --- a/meta/lib/oeqa/core/loader.py +++ b/meta/lib/oeqa/core/loader.py @@ -216,6 +216,13 @@ class OETestLoader(unittest.TestLoader): # use_load_tests deprecation via *args and **kws. See issue 16662. if sys.version_info >= (3,5): def loadTestsFromModule(self, module, *args, pattern=None, **kws): + """ + Returns a suite of all tests cases contained in module. + """ + if module.__name__ in sys.builtin_module_names: + msg = 'Tried to import %s test module but is a built-in' + raise ImportError(msg % module.__name__) + if not self.modules or "all" in self.modules or \ module.__name__ in self.modules: return super(OETestLoader, self).loadTestsFromModule( @@ -227,6 +234,10 @@ class OETestLoader(unittest.TestLoader): """ Returns a suite of all tests cases contained in module. """ + if module.__name__ in sys.builtin_module_names: + msg = 'Tried to import %s test module but is a built-in' + raise ImportError(msg % module.__name__) + if not self.modules or "all" in self.modules or \ module.__name__ in self.modules: return super(OETestLoader, self).loadTestsFromModule(