[GR-23218] Make test_descr pass - set __bases__/best_base().

PullRequest: graalpython/1124

Author: tomasstupka

graalpython/com.oracle.graal.python.test/src/tests/test_type.py

@@ -37,40 +37,116 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+def assert_raises(err, fn, *args, **kwargs):
+    raised = False
+    try:
+        fn(*args, **kwargs)
+    except err:
+        raised = True
+    assert raised
 
 def test_base():
     A = type('A', (), {})
     assert A.__base__ == object
 
-    # class B:
-    #     def ham(self):
-    #         return 'ham%d' % self
-    #
-    # class A(object):
-    #     pass
-    #
-    # class B(dict):
-    #     pass
-    #
-    # class C(A, B):
-    #     pass
-    #
-    # assert C.__base__ == B
-    #
-    # class A(object):
-    #     pass
-    #
-    # class B(object):
-    #     pass
-    #
-    # class C(A, B):
-    #     pass
-    #
-    # assert C.__base__ == A
-    #
-    # C = type('C', (B, int), {'spam': lambda self: 'spam%s' % self})
-    # assert C.__base__ == int
+    class B:
+        def ham(self):
+            return 'ham%d' % self
 
+    class A(object):
+        pass
+
+    class B(dict):
+        pass
+
+    class C(A, B):
+        pass
+
+    assert C.__base__ == B
+
+    #-----------------------------------------------
+    
+    class A(object):
+        pass
+
+    class B(object):
+        pass
+
+    class C(A, B):
+        pass
+
+    assert C.__base__ == A
+
+    C = type('C', (B, int), {'spam': lambda self: 'spam%s' % self})
+    assert C.__base__ == int
+    
+    #-----------------------------------------------
+    
+    class A (object): pass
+
+    class BB (A): pass
+
+    class B(BB): pass
+
+    class C (A): 
+        __slots__ = ['a']
+
+    class D (B, C): pass
+
+    assert D.__base__ == C
+
+    #-----------------------------------------------
+    
+    class A: pass
+
+    class B: pass
+
+    class C(A): pass
+
+    C.__bases__ = (A, B)
+
+    assert C.__bases__ == (A, B)
+    assert A.__subclasses__() == [C]
+    assert B.__subclasses__() == [C]
+
+    #-----------------------------------------------
+    
+    class A: pass
+
+    class B: pass
+
+    class C(A, B): pass
+
+    C.__bases__ == (A, B)
+    A.__subclasses__() == [C]
+    B.__subclasses__() == [C]
+
+    raised = False
+    try:
+        C.__bases__ = (int,)
+    except TypeError:
+        raised = True
+    assert raised
+
+    assert C.__bases__ == (A, B)
+    assert A.__subclasses__() == [C]
+    assert B.__subclasses__() == [C]    
+
+    #-----------------------------------------------
+    
+#    class A: pass
+#
+#    class B: pass
+#
+#    class C: pass
+#
+#    raised = False
+#    try:
+#        C.__bases__ = (A, B)
+#    except TypeError:
+#        raised = True
+#    assert raised
+#    assert C.__bases__ == [object]
 
 def test_namespace_with_non_string_keys():
     class MyStr(str):

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_descr.txt

@@ -4,6 +4,7 @@
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_bpo25750
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_buffer_inheritance
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_builtin_function_or_method
+*graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_classic
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_classic_comparisons
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_classmethods
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_classmethods_in_c
@@ -27,16 +28,21 @@
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_keywords
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_meth_class_get
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_method_wrapper
+*graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_methods
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_methods_in_c
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_mixing_slot_wrappers
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_monotonicity
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_mro_disagreement
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_multiple_inheritance
-*graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_mutable_bases_with_failing_mro
+*graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_mutable_bases
+*graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_mutable_bases_catch_mro_conflict
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_mutable_names
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_newslots
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_not_implemented
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_object_class
+*graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_overloading
+*graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_properties_doc_attrib
+*graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_properties_plus
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_proxy_super
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_python_dicts
 *graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_python_lists
@@ -67,6 +73,7 @@
 *graalpython.lib-python.3.test.test_descr.MroTest.test_incomplete_extend
 *graalpython.lib-python.3.test.test_descr.MroTest.test_incomplete_set_bases_on_self
 *graalpython.lib-python.3.test.test_descr.MroTest.test_incomplete_super
+*graalpython.lib-python.3.test.test_descr.MroTest.test_reent_set_bases_on_base
 *graalpython.lib-python.3.test.test_descr.MroTest.test_reent_set_bases_on_direct_base
 *graalpython.lib-python.3.test.test_descr.OperatorsTest.test_complexes
 *graalpython.lib-python.3.test.test_descr.OperatorsTest.test_dicts