[FIX] tests: allow OdooSuite to handle unittest.TestCase without crashing

rco-odoo · rco-odoo · commit adf28d52a33e · 2021-11-11T17:26:28.000Z
closes odoo#79669 Signed-off-by: Raphael Collet (rco) <rco@openerp.com>
diff --git a/odoo/addons/base/tests/__init__.py b/odoo/addons/base/tests/__init__.py
@@ -36,5 +36,6 @@
 from . import test_res_partner_bank
 from . import test_res_users
 from . import test_reports
+from . import test_test_suite
 from . import test_tests_tags
 from . import test_cloc
diff --git a/odoo/addons/base/tests/test_test_suite.py b/odoo/addons/base/tests/test_test_suite.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from unittest import TestCase
+
+
+class TestTestSuite(TestCase):
+    test_tags = {'standard', 'at_install'}
+    test_module = 'base'
+
+    def test_test_suite(self):
+        """ Check that OdooSuite handles unittest.TestCase correctly. """
diff --git a/odoo/tests/common.py b/odoo/tests/common.py
@@ -200,12 +200,13 @@ def _handleClassSetUp(self, test, result):
                 finally:
                     unittest.suite._call_if_exists(result, '_restoreStdout')
                     if currentClass._classSetupFailed is True:
-                        currentClass.doClassCleanups()
-                        if len(currentClass.tearDown_exceptions) > 0:
-                            for exc in currentClass.tearDown_exceptions:
-                                self._createClassOrModuleLevelException(
-                                        result, exc[1], 'setUpClass', className,
-                                        info=exc)
+                        if hasattr(currentClass, 'doClassCleanups'):
+                            currentClass.doClassCleanups()
+                            if len(currentClass.tearDown_exceptions) > 0:
+                                for exc in currentClass.tearDown_exceptions:
+                                    self._createClassOrModuleLevelException(
+                                            result, exc[1], 'setUpClass', className,
+                                            info=exc)
 
         def _createClassOrModuleLevelException(self, result, exc, method_name, parent, info=None):
             errorName = '%s (%s)' % (method_name, parent)
@@ -248,14 +249,15 @@ def _tearDownPreviousClass(self, test, result):
                                                             className)
                 finally:
                     unittest.suite._call_if_exists(result, '_restoreStdout')
-                    previousClass.doClassCleanups()
-                    if len(previousClass.tearDown_exceptions) > 0:
-                        for exc in previousClass.tearDown_exceptions:
-                            className = unittest.util.strclass(previousClass)
-                            self._createClassOrModuleLevelException(result, exc[1],
-                                                                    'tearDownClass',
-                                                                    className,
-                                                                    info=exc)
+                    if hasattr(previousClass, 'doClassCleanups'):
+                        previousClass.doClassCleanups()
+                        if len(previousClass.tearDown_exceptions) > 0:
+                            for exc in previousClass.tearDown_exceptions:
+                                className = unittest.util.strclass(previousClass)
+                                self._createClassOrModuleLevelException(result, exc[1],
+                                                                        'tearDownClass',
+                                                                        className,
+                                                                        info=exc)
 
 
 class TreeCase(unittest.TestCase):
