Update some more tests

python · ilevkivskyi · Aug 9, 2026 · Aug 9, 2026 · Aug 18, 2026 · Aug 19, 2026
commit 938a82ac9042151af956a4664df6e5b81e472763
diff --git a/test-data/unit/check-columns.test b/test-data/unit/check-columns.test
@@ -347,6 +347,7 @@ if int():
     xyz = 0  # type: blurbnard blarb
 [out]
 main:3:5: error: Syntax error in type comment "blurbnard blarb"
+main:3:5: error: Invalid type comment or annotation
 
 [case testColumnProperty]
 class A:

diff --git a/test-data/unit/check-errorcodes.test b/test-data/unit/check-errorcodes.test
@@ -111,20 +111,24 @@ def f(): # E: Type signature has too many parameters  [syntax]
     # type: (int) -> None
     1
 
-x = 0  # type: x y  # E: Syntax error in type comment "x y"  [syntax]
+x = 0  # type: x y  # E: Syntax error in type comment "x y"  [syntax] \
+                    # E: Invalid type comment or annotation  [valid-type]
 
-[case testErrorCodeSyntaxError3]
+[case testErrorCodeSyntaxError3_old_parser]
 # This is a bit inconsistent -- syntax error would be more logical?
 x: 'a b'  # E: Invalid type comment or annotation  [valid-type]
 for v in x:  # type: int, int  # E: Syntax error in type annotation  [syntax] \
     # N: Suggestion: Use Tuple[T1, ..., Tn] instead of (T1, ..., Tn)
     pass
 
+[case testErrorCodeSyntaxError4]
+x = 1  # type: int, int  # type: int, int  # E: Syntax error in type annotation  [syntax] \
+                         # N: Suggestion: Use Tuple[T1, ..., Tn] instead of (T1, ..., Tn)
+
 [case testErrorCodeSyntaxErrorIgnoreNote]
 # This is a bit inconsistent -- syntax error would be more logical?
 x: 'a b'  # type: ignore[valid-type]
-for v in x:  # type: int, int  # type: ignore[syntax]
-    pass
+y = 1  # type: int, int  # type: ignore[syntax]
 
 [case testErrorCodeIgnore1]
 'x'.foobar  # type: ignore[attr-defined]

diff --git a/test-data/unit/check-fastparse.test b/test-data/unit/check-fastparse.test
@@ -2,7 +2,8 @@
 1 +  # E: Expected an expression
 
 [case testFastParseTypeCommentSyntaxError]
-x = None # type: a : b  # E: Syntax error in type comment "a : b"
+x = None # type: a : b  # E: Syntax error in type comment "a : b" \
+                        # E: Invalid type comment or annotation
 
 [case testFastParseInvalidTypeComment]
 x = None # type: a + b  # E: Invalid type comment or annotation
@@ -150,7 +151,8 @@ def f(a,        # type: A
 [builtins fixtures/dict.pyi]
 [out]
 
-[case testFastParsePerArgumentAnnotationsWithAnnotatedBareStar]
+-- New parser ignores this instead of failing loudly.
+[case testFastParsePerArgumentAnnotationsWithAnnotatedBareStar_old_parser]
 def f(*, # type: int  # E: Bare * has associated type comment
       x  # type: str
       ):

diff --git a/test-data/unit/check-functions.test b/test-data/unit/check-functions.test
@@ -774,7 +774,8 @@ class A:
 main:6: error: Incompatible types in assignment (expression has type "int", variable has type "A")
 main:8: error: Argument 1 to "g" has incompatible type "A"; expected "int"
 
-[case testNestedFunctionInMethodWithTooFewArgumentsInTypeComment]
+-- Rejecting this is somewhat tricky in the new parser
+[case testNestedFunctionInMethodWithTooFewArgumentsInTypeComment_old_parser]
 class A:
     def f(self):
         # type: () -> None
@@ -795,7 +796,8 @@ class A:
             arg.B  # E: "object" has no attribute "B"
 [file mod.py]
 
-[case testDeepNestedFunctionWithTooFewArgumentsInTypeComment]
+-- Rejecting this is somewhat tricky in the new parser
+[case testDeepNestedFunctionWithTooFewArgumentsInTypeComment_old_parser]
 class A:
     def f(self):
         # type: () -> None
@@ -2152,13 +2154,25 @@ class A:
 def f(x, y, z): # type: (..., int) -> None
     pass
 [out]
-main:1: error: Ellipses cannot accompany other parameter types in function type signature
+main:1: error: Type signature has too few parameters
 
 [case testEllipsisWithSomethingBeforeItFails]
 def f(x, y, z): # type: (int, ...) -> None
     pass
 [out]
-main:1: error: Ellipses cannot accompany other parameter types in function type signature
+main:1: error: Type signature has too few parameters
+
+[case testEllipsisWithSomethingAfterItFails2]
+def f(x, y): # type: (..., int) -> None
+    pass
+[out]
+main:1: error: Unexpected "..."
+
+[case testEllipsisWithSomethingBeforeItFails2]
+def f(x, y): # type: (int, ...) -> None
+    pass
+[out]
+main:1: error: Unexpected "..."
 
 [case testRejectCovariantArgument]
 from typing import TypeVar, Generic