[3.14] gh-127146: Emscripten: more regular stack overflow skips (GH-136708) (#136712)

Makes the Emscripten stack overflow skip message consistent with WASI,
and replaces some ad-hoc skips.
(cherry picked from commit c730952aa64b790c75c437cb63a1242dc08c2e97)

Co-authored-by: Hood Chatham <roberthoodchatham@gmail.com>

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index ce18518bb8aa1829fa536e64ec783961a73ea02e..001ecec4dcd4ebda147a533d21c48d3173bd0665 100644 (file)
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -570,7 +570,7 @@ is_emscripten = sys.platform == "emscripten"
 is_wasi = sys.platform == "wasi"
 
 def skip_emscripten_stack_overflow():
-    return unittest.skipIf(is_emscripten, "Exhausts limited stack on Emscripten")
+    return unittest.skipIf(is_emscripten, "Exhausts stack on Emscripten")
 
 def skip_wasi_stack_overflow():
     return unittest.skipIf(is_wasi, "Exhausts stack on WASI")

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index ea076ba4fef2db687cc7490a92ebf91ab51ffce7..d420f097e74721513de0a805214ab9846f76c3d9 100644 (file)
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -3942,7 +3942,7 @@ class ClassPropertiesAndMethods(unittest.TestCase):
         # it as a leak.
         del C.__del__
 
-    @unittest.skipIf(support.is_emscripten, "Seems to works in Pyodide?")
+    @support.skip_emscripten_stack_overflow()
     @support.skip_wasi_stack_overflow()
     def test_slots_trash(self):
         # Testing slot trash...

diff --git a/Lib/test/test_xml_etree_c.py b/Lib/test/test_xml_etree_c.py
index 9ed0f4096a45e3c683a50dd5ae26406fb182d42f..270b9d6da8e7b9ed564eacbc179209f4e625c5b4 100644 (file)
--- a/Lib/test/test_xml_etree_c.py
+++ b/Lib/test/test_xml_etree_c.py
@@ -58,7 +58,7 @@ class MiscTests(unittest.TestCase):
         self.assertEqual(element.attrib, {'A': 'B', 'C': 'D'})
 
     @support.skip_wasi_stack_overflow()
-    @unittest.skipIf(support.is_emscripten, "segfaults")
+    @support.skip_emscripten_stack_overflow()
     def test_trashcan(self):
         # If this test fails, it will most likely die via segfault.
         e = root = cET.Element('root')