1 files changed, 28 insertions, 42 deletions

diff --git a/sources/shiboken6/tests/samplebinding/multi_cpp_inheritance_test.py b/sources/shiboken6/tests/samplebinding/multi_cpp_inheritance_test.py
index c522d0e38..fc6b26c3f 100644
--- a/sources/shiboken6/tests/samplebinding/multi_cpp_inheritance_test.py
+++ b/sources/shiboken6/tests/samplebinding/multi_cpp_inheritance_test.py
@@ -1,33 +1,6 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-#############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the test suite of Qt for Python.
-##
-## $QT_BEGIN_LICENSE:GPL-EXCEPT$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 as published by the Free Software
-## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 '''Test cases for multiple inheritance'''
 
@@ -40,72 +13,85 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from shiboken_paths import init_paths
 init_paths()
 
-from sample import *
+from sample import ObjectType, Point, Str
+
 
 class SimpleUseCase(ObjectType, Str):
     def __init__(self, name):
         ObjectType.__init__(self)
         Str.__init__(self, name)
 
+
 class SimpleUseCaseReverse(Str, ObjectType):
     def __init__(self, name):
         ObjectType.__init__(self)
         Str.__init__(self, name)
 
+
 class SimpleUseCase2(SimpleUseCase):
     def __init__(self, name):
         SimpleUseCase.__init__(self, name)
 
+
 class ComplexUseCase(SimpleUseCase2, Point):
     def __init__(self, name):
         SimpleUseCase2.__init__(self, name)
         Point.__init__(self)
 
+
 class ComplexUseCaseReverse(Point, SimpleUseCase2):
     def __init__(self, name):
         SimpleUseCase2.__init__(self, name)
         Point.__init__(self)
 
+
 class MultipleCppDerivedTest(unittest.TestCase):
-    def testInstanciation(self):
+    def testInstantiation(self):
         s = SimpleUseCase("Hi")
         self.assertEqual(s, "Hi")
         s.setObjectName(s)
         self.assertEqual(s.objectName(), "Hi")
 
-    def testInstanciation2(self):
+    def testInstantiation2(self):
         s = SimpleUseCase2("Hi")
         self.assertEqual(s, "Hi")
         s.setObjectName(s)
         self.assertEqual(s.objectName(), "Hi")
 
-    def testComplexInstanciation(self):
+    def testComplexInstantiation(self):
         c = ComplexUseCase("Hi")
         self.assertEqual(c, "Hi")
         c.setObjectName(c)
         self.assertEqual(c.objectName(), "Hi")
-        c.setX(2);
+        c.setX(2)
         self.assertEqual(c.x(), 2)
 
+
 class MultipleCppDerivedReverseTest(unittest.TestCase):
-    def testInstanciation(self):
+    def testInstantiation(self):
         s = SimpleUseCaseReverse("Hi")
         self.assertEqual(s, "Hi")
         s.setObjectName(s)
         self.assertEqual(s.objectName(), "Hi")
 
-    def testInstanciation2(self):
+    def testInstantiation2(self):
         s = SimpleUseCase2("Hi")
         self.assertEqual(s, "Hi")
         s.setObjectName(s)
         self.assertEqual(s.objectName(), "Hi")
 
-    def testComplexInstanciation(self):
-        c = ComplexUseCaseReverse("Hi")
-        c.setObjectName(c)
-        self.assertEqual(c.objectName(), "Hi")
-        c.setX(2);
-        self.assertEqual(c, Point(2, 0))
+    def testComplexInstantiation(self):
+        # PYSIDE-1564: This test can no longer work because of this MRO:
+        # ('ComplexUseCaseReverse', 'Point', 'SimpleUseCase2', 'SimpleUseCase',
+        #  'ObjectType', 'Str', 'Object', 'object')
+        # By multiple inheritance Point would be called first but has no argument.
+        with self.assertRaises(TypeError):
+            c = ComplexUseCaseReverse("Hi")  # noqa: F841
+        # c.setObjectName(c)
+        # self.assertEqual(c.objectName(), "Hi")
+        # c.setX(2);
+        # self.assertEqual(c, Point(2, 0))
+
 
 if __name__ == '__main__':
     unittest.main()