[oe-commits] [openembedded-core] 13/43: oeqa/core/loader.py: Fix _make_failed_test for python >= 3.4.4

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 767b68e6ca22512ff80e6fbc42154f3f0c2206c0
Author: Aníbal Limón <anibal.limon at linux.intel.com>
AuthorDate: Thu Jun 15 17:09:49 2017 -0500

    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 at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/lib/oeqa/core/loader.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/meta/lib/oeqa/core/loader.py b/meta/lib/oeqa/core/loader.py
index 229f094..80e3d28 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):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.