Fix 4/6 failing tests

gvanrossum · gvanrossum · commit 91dd86cc64fc · 2023-06-24T21:24:30.000-07:00
diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
@@ -18,6 +18,8 @@
 import tempfile
 import textwrap
 
+import _testinternalcapi
+
 if not support.has_subprocess_support:
     raise unittest.SkipTest("test module requires subprocess")
 
@@ -1777,6 +1779,8 @@ def test_frozenmain(self):
 
     @unittest.skipUnless(support.Py_DEBUG,
                          '-X showrefcount requires a Python debug build')
+    @unittest.skipIf(_testinternalcapi.get_optimizer(),
+                     'There are known leaks in the optimizer')
     def test_no_memleak(self):
         # bpo-1635741: Python must release all memory at exit
         tests = (
diff --git a/Lib/test/test_monitoring.py b/Lib/test/test_monitoring.py
@@ -9,6 +9,8 @@
 import types
 import unittest
 
+import _testinternalcapi
+
 
 PAIR = (0,1)
 
@@ -497,6 +499,8 @@ def test_two_with_disable(self):
 
 class LineMonitoringTest(MonitoringTestBase, unittest.TestCase):
 
+    @unittest.skipIf(_testinternalcapi.get_optimizer(),
+                     "The optimizer changes the test behavior")
     def test_lines_single(self):
         try:
             self.assertEqual(sys.monitoring._all_events(), {})
@@ -515,6 +519,8 @@ def test_lines_single(self):
             self.assertEqual(sys.monitoring._all_events(), {})
             sys.monitoring.restart_events()
 
+    @unittest.skipIf(_testinternalcapi.get_optimizer(),
+                     "The optimizer changes the test behavior")
     def test_lines_loop(self):
         try:
             self.assertEqual(sys.monitoring._all_events(), {})
@@ -533,6 +539,8 @@ def test_lines_loop(self):
             self.assertEqual(sys.monitoring._all_events(), {})
             sys.monitoring.restart_events()
 
+    @unittest.skipIf(_testinternalcapi.get_optimizer(),
+                     "The optimizer changes the test behavior")
     def test_lines_two(self):
         try:
             self.assertEqual(sys.monitoring._all_events(), {})
diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
@@ -9,6 +9,8 @@
 import asyncio
 from test.support import import_helper
 
+import _testinternalcapi
+
 support.requires_working_socket(module=True)
 
 class tracecontext:
@@ -326,6 +328,8 @@ def traceWithGenexp(self, frame, event, arg):
         return self.trace
 
 
+@unittest.skipIf(_testinternalcapi.get_optimizer(),
+                    "The optimizer changes the test behavior")
 class TraceTestCase(unittest.TestCase):
 
     # Disable gc collection when tracing, otherwise the
diff --git a/Lib/test/test_trace.py b/Lib/test/test_trace.py
@@ -12,6 +12,8 @@
 
 from test.tracedmodules import testmod
 
+import _testinternalcapi
+
 ##
 ## See also test_sys_settrace.py, which contains tests that cover
 ## tracing of many more code blocks.
@@ -141,6 +143,8 @@ def test_traced_func_linear(self):
 
         self.assertEqual(self.tracer.results().counts, expected)
 
+    @unittest.skipIf(_testinternalcapi.get_optimizer(),
+                     "Test doesn't work when tracing optimizer is active")
     def test_traced_func_loop(self):
         self.tracer.runfunc(traced_func_loop, 2, 3)
 
@@ -165,6 +169,8 @@ def test_traced_func_importing(self):
 
         self.assertEqual(self.tracer.results().counts, expected)
 
+    @unittest.skipIf(_testinternalcapi.get_optimizer(),
+                     "Test doesn't work when tracing optimizer is active")
     def test_trace_func_generator(self):
         self.tracer.runfunc(traced_func_calling_generator)
 
@@ -235,6 +241,8 @@ def setUp(self):
         self.my_py_filename = fix_ext_py(__file__)
         self.addCleanup(sys.settrace, sys.gettrace())
 
+    @unittest.skipIf(_testinternalcapi.get_optimizer(),
+                     "Test doesn't work when tracing optimizer is active")
     def test_exec_counts(self):
         self.tracer = Trace(count=1, trace=0, countfuncs=0, countcallers=0)
         code = r'''traced_func_loop(2, 5)'''
