tests: fix for 3.14

Author: MatthieuDartiailh

tests/__init__.py

@@ -181,16 +181,21 @@ def assertCodeObjectEqual(self, code1: types.CodeType, code2: types.CodeType):
                 list(dis.findlinestarts(code1)), list(dis.findlinestarts(code2))
             )
 
-        # If names have been re-ordered compared the output of dis.instructions
+        # If names or consts have been re-ordered compared the output of dis.instructions
         if sys.version_info >= (3, 12) and (
-            code1.co_names != code2.co_names or code1.co_varnames != code2.co_varnames
+            code1.co_consts != code2.co_consts
+            or code1.co_names != code2.co_names
+            or code1.co_varnames != code2.co_varnames
         ):
             instrs1 = list(dis.get_instructions(code1))
             instrs2 = list(dis.get_instructions(code2))
             self.assertEqual(len(instrs1), len(instrs2))
             for i1, i2 in zip(instrs1, instrs2):
                 self.assertEqual(i1.opcode, i2.opcode)
-                self.assertEqual(i1.argval, i2.argval)
+                if isinstance(i1.argval, types.CodeType):
+                    pass
+                else:
+                    self.assertEqual(i1.argval, i2.argval)
         elif sys.version_info >= (3, 9):
             self.assertSequenceEqual(code1.co_code, code2.co_code)
         # On Python 3.8 it happens that fast storage index vary in a roundtrip

tests/exception_handling_cases.py

@@ -215,14 +215,14 @@ def try_except_in_else():
 
 def try_finally_in_else():
     try:
-        a = 1
+        a = "a"
     except ValueError as e:
         return
     else:
         try:
             pass
         finally:
-            a = 1
+            a = "a"
 
 
 def try_except_in_finally():
@@ -264,65 +264,65 @@ def try_except_group():
 
 
 def with_no_store():
-    with contextlib.nullcontext(1):
-        a = 1
+    with contextlib.nullcontext("1"):
+        a = "1"
     return a
 
 
 def with_store():
-    with contextlib.nullcontext(1) as b:
-        a = 1
+    with contextlib.nullcontext("1") as b:
+        a = "1"
     return a
 
 
 def try_with():
     try:
-        with contextlib.nullcontext(1):
-            a = 1
+        with contextlib.nullcontext("1"):
+            a = "1"
     except Exception:
-        return min(1, 2)
+        return min("1", "2")
 
     return a
 
 
 def with_try():
-    with contextlib.nullcontext(1):
+    with contextlib.nullcontext("1"):
         try:
-            b = 1
+            b = "1"
         except Exception:
-            return min(1, 2)
+            return min("1", "2")
 
     return b
 
 
 async def async_with_no_store():
     async with contextlib.nullcontext():
-        a = 1
+        a = "1"
     return a
 
 
 async def async_with_store():
     async with contextlib.nullcontext() as b:
-        a = 1
+        a = "1"
     return a
 
 
 async def try_async_with():
     try:
         async with contextlib.nullcontext(1):
-            a = 1
+            a = "1"
     except Exception:
-        return min(1, 2)
+        return min("1", "2")
 
     return a
 
 
 async def async_with_try():
     async with contextlib.nullcontext(1):
         try:
-            b = 1
+            b = "1"
         except Exception:
-            return min(1, 2)
+            return min(1.0, 2.0)
 
     return b