fix tests

Author: picnixz

Lib/test/test_xml_etree.py

@@ -2680,10 +2680,28 @@ class Y(X, ET.Element):
         e = ET.Element('foo')
         e.extend(L)
 
+    def test_remove_with_clear_child(self):
+        class X(ET.Element):
+            def __eq__(self, o):
+                del e[:]
+                return False
+
+        # The pure Python implementation raises a ValueError but the C
+        # implementation raises a RuntimeError (like OrderedDict does).
+        exc_type = ValueError if ET is pyET else RuntimeError
+
+        e = ET.Element('foo')
+        e.extend([X('bar')])
+        self.assertRaises(exc_type, e.remove, ET.Element('baz'))
+
+        e = ET.Element('foo')
+        e.extend([ET.Element('bar')])
+        self.assertRaises(exc_type, e.remove, X('baz'))
+
     def test_remove_with_clear_children(self):
         # See: https://github.com/python/cpython/issues/126033
 
-        class EvilElement(ET.Element):
+        class X(ET.Element):
             def __eq__(self, o):
                 root.clear()
                 return False
@@ -2692,39 +2710,36 @@ def __eq__(self, o):
         # implementation raises a RuntimeError (like OrderedDict does).
         exc_type = ValueError if ET is pyET else RuntimeError
 
-        root = ET.Element('.')
-        root.append(EvilElement('foo'))
-        root.append(ET.Element('bar'))
-        self.assertRaises(exc_type, root.remove, ET.Element('pouet'))
+        for foo_type, rem_type in [(X, ET.Element), (ET.Element, X)]:
+            with self.subTest(foo_type=foo_type, rem_type=rem_type):
+                root = ET.Element('.')
+                root.extend([foo_type('foo'), rem_type('bar')])
+                self.assertRaises(exc_type, root.remove, rem_type('baz'))
 
-        root = ET.Element('.')
-        root.append(ET.Element('foo'))
-        root.append(EvilElement('bar'))
-        self.assertRaises(exc_type, root.remove, EvilElement('pouet'))
-
-    def test_remove_with_mutate_children(self):
+    def test_remove_with_mutate_root(self):
         # See: https://github.com/python/cpython/issues/126033
 
-        class EvilElement(ET.Element):
+        first_element = ET.Element('foo')
+
+        class X(ET.Element):
             def __eq__(self, o):
                 # Remove the first element so that the list size changes.
                 # This causes an infinite recursion error in the Python
                 # implementation, but we do not really care about it.
-                root.remove(ET.Element('foo'))
+                #
+                # Depending on whether the first element is or is not
+                root.remove(first_element)
                 return False
 
-        # The pure Python implementation raises a ValueError (or hits the
-        # recursion limit) but the C implementation raises a RuntimeError
-        # (like OrderedDict does).
-        exc_type = (RecursionError, ValueError) if ET is pyET else RuntimeError
-
-        root = ET.Element('.')
-        root.extend([ET.Element('foo'), EvilElement('bar')])
-        self.assertRaises(exc_type, root.remove, ET.Element('baz'))
+        # The pure Python implementation raises a ValueError but the C
+        # implementation raises a RuntimeError (like OrderedDict does).
+        exc_type = ValueError if ET is pyET else RuntimeError
 
-        root = ET.Element('.')
-        root.extend([ET.Element('foo'), EvilElement('bar')])
-        self.assertRaises(exc_type, root.remove, EvilElement('baz'))
+        for bar_type, rem_type in [(X, ET.Element), (ET.Element, X), (X, X)]:
+            with self.subTest(bar_type=bar_type, rem_type=rem_type):
+                root = ET.Element('.')
+                root.extend([first_element, bar_type('bar')])
+                self.assertRaises(exc_type, root.remove, rem_type('baz'))
 
     @support.infinite_recursion(25)
     def test_recursive_repr(self):

Lib/test/test_xml_etree_c.py

@@ -234,7 +234,7 @@ class SizeofTest(unittest.TestCase):
     def setUp(self):
         self.elementsize = support.calcobjsize('5P')
         # extra
-        self.extra = struct.calcsize('PnnP4PN')
+        self.extra = struct.calcsize('PnnP4P')
 
     check_sizeof = support.check_sizeof