Address CR (more tests)

Author: ilevkivskyi

test-data/unit/check-classvar.test

@@ -319,7 +319,9 @@ A[int, str].x  # E: Access to generic class variables is ambiguous
 
 class Bad(A[int, str]):
     pass
-Bad.x  # E: Access to generic class variables is ambiguous
+reveal_type(Bad.x)  # E: Access to generic class variables is ambiguous \
+                    # N: Revealed type is "Union[builtins.int, tuple[builtins.str, type[builtins.str]]]"
+reveal_type(Bad().x)  # N: Revealed type is "Union[builtins.int, tuple[builtins.str, type[builtins.str]]]"
 
 class Good(A[int, str]):
     x = 42

test-data/unit/check-selftype.test

@@ -2221,7 +2221,7 @@ class C(A, B):  # OK: both methods take Self
 [builtins fixtures/tuple.pyi]
 
 [case testSelfTypeClassMethodNotSilentlyErased]
-from typing import ClassVar, Self, Optional
+from typing import Self, Optional
 
 class X:
     _inst: Optional[Self] = None
@@ -2231,6 +2231,15 @@ class X:
         if cls._inst is None:
             cls._inst = cls()
         return cls._inst
+
+reveal_type(X._inst)  # E: Access to generic instance variables via class is ambiguous \
+                      # N: Revealed type is "Union[__main__.X, None]"
+reveal_type(X()._inst)  # N: Revealed type is "Union[__main__.X, None]"
+
+class Y(X): ...
+reveal_type(Y._inst)  # E: Access to generic instance variables via class is ambiguous \
+                      # N: Revealed type is "Union[__main__.Y, None]"
+reveal_type(Y()._inst)  # N: Revealed type is "Union[__main__.Y, None]"
 [builtins fixtures/tuple.pyi]
 
 [case testSelfInFuncDecoratedClassmethod]

test-data/unit/check-typevar-tuple.test

@@ -2638,6 +2638,17 @@ class C(Generic[Unpack[Ts]]):
 
 reveal_type(C.x)  # E: Access to generic instance variables via class is ambiguous \
                   # N: Revealed type is "builtins.tuple[Any, ...]"
+
+class Bad(C[int, int]):
+    pass
+reveal_type(Bad.x)  # E: Access to generic instance variables via class is ambiguous \
+                    # N: Revealed type is "tuple[builtins.int, builtins.int]"
+reveal_type(Bad().x)  # N: Revealed type is "tuple[builtins.int, builtins.int]"
+
+class Good(C[int, int]):
+    x = (1, 1)
+reveal_type(Good.x)  # N: Revealed type is "tuple[builtins.int, builtins.int]"
+reveal_type(Good().x)  # N: Revealed type is "tuple[builtins.int, builtins.int]"
 [builtins fixtures/tuple.pyi]
 
 [case testConstraintsIncludeTupleFallback]