fix tests

Author: ikonst

test-data/unit/check-expressions.test

@@ -437,18 +437,18 @@ class D(Iterable[A]):
 [builtins fixtures/bool.pyi]
 
 [case testNonBooleanContainsReturnValue]
-a, b, c = None, None, None # type: (A, bool, int)
+a, b, c = None, None, None # type: (A, bool, str)
 if int():
     b = a not in a
 if int():
     b = a in a
 if int():
-    c = a not in a  # E: Incompatible types in assignment (expression has type "bool", variable has type "int")
+    c = a not in a  # E: Incompatible types in assignment (expression has type "bool", variable has type "str")
 if int():
-    c = a in a  # E: Incompatible types in assignment (expression has type "bool", variable has type "int")
+    c = a in a  # E: Incompatible types in assignment (expression has type "bool", variable has type "str")
 
 class A:
-  def __contains__(self, x: 'A') -> int: pass
+  def __contains__(self, x: 'A') -> str: pass
 [builtins fixtures/bool.pyi]
 
 [case testInWithInvalidArgs]

test-data/unit/check-unreachable-code.test

@@ -619,24 +619,25 @@ if MYPY or mypy_only:
 # flags: --always-false COMPILE_TIME_FALSE
 from typing import Literal
 
-indeterminate: bool
+indeterminate: str
 COMPILE_TIME_FALSE: Literal[True]  # type-narrowing: mapped in 'if' only
 a = COMPILE_TIME_FALSE or indeterminate
-reveal_type(a)  # N: Revealed type is "builtins.bool"
+reveal_type(a)  # N: Revealed type is "builtins.str"
 b = indeterminate or COMPILE_TIME_FALSE
-reveal_type(b)  # N: Revealed type is "Union[builtins.bool, Literal[True]]"
+reveal_type(b)  # N: Revealed type is "Union[builtins.str, Literal[True]]"
 [builtins fixtures/bool.pyi]
 [typing fixtures/typing-medium.pyi]
 
 [case testSemanticAnalysisTrueButTypeNarrowingFalse]
 # flags: --always-true COMPILE_TIME_TRUE
-indeterminate: bool
-COMPILE_TIME_TRUE: None  # type narrowed to `else` only
+indeterminate: str
+COMPILE_TIME_TRUE: Literal[False]  # type narrowed to `else` only
 a = COMPILE_TIME_TRUE or indeterminate
-reveal_type(a)  # N: Revealed type is "None"
+reveal_type(a)  # N: Revealed type is "Literal[False]"
 b = indeterminate or COMPILE_TIME_TRUE
-reveal_type(b)  # N: Revealed type is "Union[builtins.bool, None]"
+reveal_type(b)  # N: Revealed type is "Union[builtins.str, Literal[False]]"
 
+[typing fixtures/typing-medium.pyi]
 [case testConditionalAssertWithoutElse]
 import typing
 

test-data/unit/lib-stub/enum.pyi

@@ -38,7 +38,7 @@ class Flag(Enum):
     def __bool__(self) -> bool: ...
 
 
-class IntFlag(Flag):
+class IntFlag(int, Flag):
     def __and__(self: _T, other: Union[int, _T]) -> _T: pass