more test fixes

Author: ikonst

mypy/test/typefixture.py

@@ -27,9 +27,6 @@ def __init__(self, variance: int = COVARIANT) -> None:
         self.oi = self.make_type_info('builtins.object')               # class object
         self.o = Instance(self.oi, [])                        # object
 
-        # The 'bool' class
-        self.bool_type_info = self.make_type_info('builtins.bool')
-
         # Type variables (these are effectively global)
 
         def make_type_var(name: str, id: int, values: List[Type], upper_bound: Type,
@@ -66,6 +63,8 @@ def make_type_var(name: str, id: int, values: List[Type], upper_bound: Type,
                                               typevars=['T'],
                                               variances=[COVARIANT])   # class tuple
         self.type_typei = self.make_type_info('builtins.type')         # class type
+        self.bool_type_info = self.make_type_info('builtins.bool')
+        self._add_bool_dunder(self.bool_type_info)
         self.functioni = self.make_type_info('builtins.function')  # function TODO
         self.ai = self.make_type_info('A', mro=[self.oi])              # class A
         self._add_bool_dunder(self.ai)

mypy/typeops.py

@@ -392,7 +392,7 @@ def get_type_special_method_bool_ret_type(t: Type) -> Optional[Type]:
     t = get_proper_type(t)
 
     if isinstance(t, Instance):
-        bool_method = t.type.names.get("__bool__", None)
+        bool_method = t.type.get("__bool__")
         if bool_method:
             callee = get_proper_type(bool_method.type)
             if isinstance(callee, CallableType):

pytest.ini

@@ -19,7 +19,7 @@ python_classes =
 python_functions =
 
 # always run in parallel (requires pytest-xdist, see test-requirements.txt)
-addopts = -nauto
+# addopts = -nauto
 
 # treat xpasses as test failures so they get converted to regular tests as soon as possible
 xfail_strict = true

test-data/unit/fixtures/bool.pyi

@@ -11,7 +11,7 @@ class type: pass
 class tuple(Generic[T]): pass
 class function: pass
 class int:
-    def __bool__(self) -> bool: pass
+    def __bool__(self) -> 'bool': pass
 class bool(int): pass
 class float: pass
 class str:

test-data/unit/fixtures/ops.pyi

@@ -30,6 +30,7 @@ class str:
     def __init__(self, x: 'int') -> None: pass
     def __add__(self, x: 'str') -> 'str': pass
     def __eq__(self, x: object) -> bool: pass
+    def __len__(self) -> int: pass
     def startswith(self, x: 'str') -> bool: pass
     def strip(self) -> 'str': pass
 

test-data/unit/fixtures/primitives.pyi

@@ -26,7 +26,6 @@ class str(Sequence[str]):
     def __add__(self, s: str) -> str: pass
     def __iter__(self) -> Iterator[str]: pass
     def __contains__(self, other: object) -> bool: pass
-    def __len__(self) -> int: pass
     def __getitem__(self, item: int) -> str: pass
     def format(self, *args, **kwargs) -> str: pass
 class bytes(Sequence[int]):