aboutsummaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2017-06-15 17:09:49 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-23 11:43:37 +0100
commit767b68e6ca22512ff80e6fbc42154f3f0c2206c0 (patch)
tree4fe04b4e5783321ec2df278623b970fa2d47e3a8 /meta/lib
parent7beed75c97a78e945e44a55b28f0f463cd6c8dcd (diff)
downloadopenembedded-core-contrib-767b68e6ca22512ff80e6fbc42154f3f0c2206c0.tar.gz
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 <anibal.limon@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/core/loader.py22
1 files changed, 13 insertions, 9 deletions
diff --git a/meta/lib/oeqa/core/loader.py b/meta/lib/oeqa/core/loader.py
index 229f094b38..80e3d2800c 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):