Update enum fixture to work with new analyzer and re-enable tests (python#6517)

ilevkivskyi · web-flow · commit 6c20e7e045bf · 2019-03-06T17:22:19.000Z
diff --git a/mypy/test/hacks.py b/mypy/test/hacks.py
@@ -11,7 +11,6 @@
     'check-classes.test',
     'check-custom-plugin.test',
     'check-dataclasses.test',
-    'check-enum.test',
     'check-expressions.test',
     'check-flags.test',
     'check-functions.test',
diff --git a/test-data/unit/check-final.test b/test-data/unit/check-final.test
@@ -990,8 +990,6 @@ class D(A, B):  # E: Cannot inherit from final class "B"
 [out]
 
 [case testFinalCantOverrideWriteable]
-# flags: --no-new-semantic-analyzer
-# Properties with setters not yet supported.
 from typing import Any, Final, final
 
 class B:
diff --git a/test-data/unit/check-inference.test b/test-data/unit/check-inference.test
@@ -1552,9 +1552,7 @@ def add():
     map[1] = 2
 [builtins fixtures/dict.pyi]
 
--- Depends on #6425
 [case testSpecialCaseEmptyListInitialization]
-# flags: --no-new-semantic-analyzer
 def f(blocks: Any): # E: Name 'Any' is not defined
     to_process = [] # E: Need type annotation for 'to_process'
     to_process = list(blocks)
diff --git a/test-data/unit/fine-grained.test b/test-data/unit/fine-grained.test
@@ -5169,9 +5169,7 @@ if int():
 ==
 aa.py:5: error: Incompatible types in assignment (expression has type "int", variable has type "C")
 
--- Depends on #6289
 [case testClassBasedEnumPropagation1]
-# flags: --no-new-semantic-analyzer
 import a
 [file a.py]
 from b import C
@@ -5270,9 +5268,7 @@ n = c
 ==
 aa.py:5: error: Incompatible types in assignment (expression has type "int", variable has type "C")
 
--- Depends on #6289
 [case testFuncBasedEnumPropagation1]
-# flags: --no-new-semantic-analyzer
 import a
 [file a.py]
 from b import C
diff --git a/test-data/unit/lib-stub/enum.pyi b/test-data/unit/lib-stub/enum.pyi
@@ -1,8 +1,9 @@
-from typing import Any, TypeVar, Union, Type, Sized, Iterator, Mapping
+from typing import Any, TypeVar, Union, Type, Sized, Iterator
 
 _T = TypeVar('_T')
 
 class EnumMeta(type, Sized):
+    def __len__(self) -> int: pass  # to make it non-abstract
     def __iter__(self: Type[_T]) -> Iterator[_T]: pass
     def __reversed__(self: Type[_T]) -> Iterator[_T]: pass
     def __getitem__(self: Type[_T], name: str) -> _T: pass
diff --git a/test-data/unit/semanal-errors.test b/test-data/unit/semanal-errors.test
@@ -938,13 +938,11 @@ a[1], a[2] = None, None # type: int, int \
 [out]
 
 [case testMissingGenericImport]
-# flags: --no-new-semantic-analyzer
-# This should be fixed by PR #6488
 from typing import TypeVar
 T = TypeVar('T')
 class A(Generic[T]): pass
 [out]
-main:5: error: Name 'Generic' is not defined
+main:3: error: Name 'Generic' is not defined
 
 [case testInvalidTypeWithinGeneric]
 from typing import Generic
