Fixes to tests for type errors and incorrect expectations.

Author: rchen152

conformance/tests/enums_members.py

@@ -16,8 +16,8 @@ class Pet(Enum):  # E?: Uninitialized attributes (pyre)
     genus: str  # Non-member attribute
     species: str  # Non-member attribute
 
-    CAT = 1  # Member attribute
-    DOG = 2  # Member attribute
+    CAT = "felis", "catus"  # Member attribute
+    DOG = "canis", "lupus"  # Member attribute
 
     def __init__(self, genus: str, species: str) -> None:
         self.genus = genus

conformance/tests/generics_defaults.py

@@ -127,7 +127,8 @@ class Class_TypeVarTuple(Generic[*DefaultTs]): ...
 def func1(x: int | set[T4]) -> T4: ...
 
 
-assert_type(func1(0), int)
+assert_type(func1(0), int)  # E[optional-default-use]
+assert_type(func1(0), Any)  # E[optional-default-use]
 
 
 # > A ``TypeVar`` that immediately follows a ``TypeVarTuple`` is not allowed
@@ -167,4 +168,4 @@ def meth(self, /) -> Self:
 
 
 assert_type(Foo7.meth, Callable[[Foo7[int]], Foo7[int]])
-assert_type(Foo7.attr, int)
+assert_type(Foo7().attr, int)

conformance/tests/generics_self_advanced.py

@@ -39,7 +39,9 @@ def method2(self) -> None:
 
     @classmethod
     def method3(cls) -> None:
+        a = cls.a  # E?: zuban errors on accessing `Self` in a classmethod
+        a_elem = cls.a[0]  # E?: zuban errors on accessing `Self` in a classmethod
         assert_type(cls, type[Self])
-        assert_type(cls.a, list[Self])
-        assert_type(cls.a[0], Self)
+        assert_type(a, list[Self])
+        assert_type(a_elem, Self)
         assert_type(cls.method1(), Self)

conformance/tests/generics_syntax_infer_variance.py

@@ -4,7 +4,7 @@
 
 # Specification: https://peps.python.org/pep-0695/#auto-variance-for-typevar
 
-from typing import Final, Generic, Iterator, Sequence, TypeVar
+from typing import Final, Generic, Iterator, overload, Sequence, TypeVar
 from dataclasses import dataclass
 
 
@@ -30,7 +30,17 @@ def __iter__(self) -> Iterator[T]:
 
 
 class ShouldBeCovariant2(Sequence[T]):
-    pass
+    @overload
+    def __getitem__(self, index: int) -> T:
+        ...
+    @overload
+    def __getitem__(self, index: slice) -> Sequence[T]:
+        ...
+    def __getitem__(self, index: int | slice) -> T | Sequence[T]:
+        ...
+
+    def __len__(self) -> int:
+        ...
 
 
 vco2_1: ShouldBeCovariant2[float] = ShouldBeCovariant2[int]()  # OK

conformance/tests/generics_type_erasure.py

@@ -1,6 +1,6 @@
 # Specification: https://typing.readthedocs.io/en/latest/spec/generics.html#instantiating-generic-classes-and-type-erasure
 
-from typing import Any, TypeVar, Generic, assert_type
+from typing import Any, Never, TypeVar, Generic, assert_type
 
 T = TypeVar("T")
 
@@ -16,10 +16,12 @@ def __init__(self, label: T | None = None) -> None:
 
 assert_type(Node(''), Node[str])
 assert_type(Node(0), Node[int])
-assert_type(Node(), Node[Any])
+assert_type(Node(), Node[Any])  # E[any-or-never1]
+assert_type(Node(), Node[Never])  # E[any-or-never1]
 
 assert_type(Node(0).label, int)
-assert_type(Node().label, Any)
+assert_type(Node().label, Any)  # E[any-or-never2]
+assert_type(Node().label, Never)  # E[any-or-never2]
 
 # > In case the inferred type uses [Any] but the intended type is more specific,
 # > you can use an annotation to force the type of the variable, e.g.:

conformance/tests/overloads_definitions.py

@@ -173,7 +173,7 @@ class Child(Base):  # E[override-final]
     # questions of override LSP compatibility and focus only on the override):
 
     @overload  # E[override-final]
-    def final_method(self, x: int) -> int: ...
+    def final_method(self, x: int) -> int: ...  # E[override-final]
 
     @overload
     def final_method(self, x: str) -> str: ...

conformance/tests/protocols_explicit.py

@@ -82,7 +82,6 @@ class Proto3(Proto2, Protocol):
 
 class Concrete1(Proto1):
     def __init__(self):
-        self.cm1 = 1
         self.im1 = 1
         self.im3 = 3
 
@@ -107,7 +106,7 @@ def __init__(self):
         self.cm11 = 11
 
 
-c3 = Concrete3()  # E: cannot instantiate abstract class
+c3 = Concrete3()
 
 
 class Concrete4(Proto1, Proto3):

conformance/tests/typeddicts_required.py

@@ -11,9 +11,6 @@
 class NotTypedDict:
     x: Required[int]  # E: Required not allowed in this context
 
-    def __init__(self, x: int) -> None:
-        self.x = x
-
 
 def func1(
     x: NotRequired[int],  # E: NotRequired not allowed in this context