From: Aníbal Limón Date: Thu, 15 Jun 2017 22:09:49 +0000 (-0500) Subject: oeqa/core/loader.py: Fix _make_failed_test for python >= 3.4.4 X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~20998 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=767b68e6ca22512ff80e6fbc42154f3f0c2206c0;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git oeqa/core/loader.py: Fix _make_failed_test for python >= 3.4.4 Python unittest change the signature of the _make_failed_test after python 3.4.4 don't pass the method name. Signed-off-by: Aníbal Limón Signed-off-by: Ross Burton --- diff --git a/meta/lib/oeqa/core/loader.py b/meta/lib/oeqa/core/loader.py index 229f094b381..80e3d2800cd 100644 --- a/meta/lib/oeqa/core/loader.py +++ b/meta/lib/oeqa/core/loader.py @@ -12,15 +12,19 @@ from oeqa.core.case import OETestCase from oeqa.core.decorator import decoratorClasses, OETestDecorator, \ OETestFilter, OETestDiscover -def _make_failed_test(classname, methodname, exception, suiteClass): - """ - When loading tests, the unittest framework stores any exceptions and - displays them only when the 'run' method is called. - - For our purposes, it is better to raise the exceptions in the loading - step rather than waiting to run the test suite. - """ - raise exception +if sys.version_info >= (3,4,4): + def _make_failed_test(classname, methodname, exception, suiteClass): + """ + When loading tests, the unittest framework stores any exceptions and + displays them only when the 'run' method is called. + + For our purposes, it is better to raise the exceptions in the loading + step rather than waiting to run the test suite. + """ + raise exception +else: + def _make_failed_test(classname, exception, suiteClass): + raise exception unittest.loader._make_failed_test = _make_failed_test def _find_duplicated_modules(suite, directory):