Have test files specify flags instead of option names (#2066)

Author: ddfisher

mypy/main.py

@@ -116,13 +116,10 @@ def parse_version(v: str) -> Tuple[int, int]:
             "Invalid python version '{}' (expected format: 'x.y')".format(v))
 
 
-def process_options(args: List[str]) -> Tuple[List[BuildSource], Options]:
-    """Process command line arguments.
-
-    Return (mypy program path (or None),
-            module to run as script (or None),
-            parsed flags)
-    """
+def process_options(args: List[str],
+                    require_targets: bool = True
+                    ) -> Tuple[List[BuildSource], Options]:
+    """Parse command line arguments."""
 
     # Make the help output a little less jarring.
     help_factory = (lambda prog:
@@ -259,14 +256,15 @@ def process_options(args: List[str]) -> Tuple[List[BuildSource], Options]:
               file=sys.stderr)
 
     # Check for invalid argument combinations.
-    code_methods = sum(bool(c) for c in [special_opts.modules,
-                                         special_opts.command,
-                                         special_opts.package,
-                                         special_opts.files])
-    if code_methods == 0:
-        parser.error("Missing target module, package, files, or command.")
-    elif code_methods > 1:
-        parser.error("May only specify one of: module, package, files, or command.")
+    if require_targets:
+        code_methods = sum(bool(c) for c in [special_opts.modules,
+                                            special_opts.command,
+                                            special_opts.package,
+                                            special_opts.files])
+        if code_methods == 0:
+            parser.error("Missing target module, package, files, or command.")
+        elif code_methods > 1:
+            parser.error("May only specify one of: module, package, files, or command.")
 
     # Set build flags.
     if special_opts.strict_optional:

mypy/test/testargs.py

@@ -13,9 +13,6 @@
 
 class ArgSuite(Suite):
     def test_coherence(self):
-        # We have to special case Options.BuildType because we're required to
-        # set a target
         options = Options()
-        options.build_type = BuildType.PROGRAM_TEXT
-        _, parsed_options = process_options(['-c', 'cmd'])
+        _, parsed_options = process_options([], require_targets=False)
         assert_equal(options, parsed_options)

mypy/test/testcheck.py

@@ -9,7 +9,7 @@
 from typing import Tuple, List, Dict, Set
 
 from mypy import build, defaults
-from mypy.main import parse_version
+from mypy.main import parse_version, process_options
 from mypy.build import BuildSource, find_module_clear_caches
 from mypy.myunit import AssertionFailure
 from mypy.test.config import test_temp_dir, test_data_prefix
@@ -278,22 +278,21 @@ def parse_module(self, program_text: str, incremental: int = 0) -> List[Tuple[st
 
     def parse_options(self, program_text: str, testcase: DataDrivenTestCase) -> Options:
         options = Options()
-        flags = re.search('# options: (.*)$', program_text, flags=re.MULTILINE)
-        version_flag = re.search('# pyversion: (.*)$', program_text, flags=re.MULTILINE)
-        platform_flag = re.search('# platform: (.*)$', program_text, flags=re.MULTILINE)
+        flags = re.search('# flags: (.*)$', program_text, flags=re.MULTILINE)
 
+        flag_list = None
         if flags:
-            options_to_enable = flags.group(1).split()
-            for opt in options_to_enable:
-                setattr(options, opt, True)
-
-        # Allow custom pyversion comment to override testcase_pyversion
-        if version_flag:
-            options.python_version = parse_version(version_flag.group(1))
+            flag_list = flags.group(1).split()
+            targets, options = process_options(flag_list, require_targets=False)
+            if targets:
+                # TODO: support specifying targets via the flags pragma
+                raise RuntimeError('Specifying targets via the flags pragma is not supported.')
         else:
-            options.python_version = testcase_pyversion(testcase.file, testcase.name)
+            options = Options()
 
-        if platform_flag:
-            options.platform = platform_flag.group(1)
+        # Allow custom python version to override testcase_pyversion
+        if (not flag_list or
+                all(flag not in flag_list for flag in ['--python-version', '-2', '--py2'])):
+            options.python_version = testcase_pyversion(testcase.file, testcase.name)
 
         return options

test-data/unit/check-async-await.test

@@ -2,20 +2,20 @@
 -- ---------------------------------------
 
 [case testAsyncDefPass]
-# options: fast_parser
+# flags: --fast-parser
 async def f() -> int:
     pass
 [builtins fixtures/async_await.pyi]
 
 [case testAsyncDefReturn]
-# options: fast_parser
+# flags: --fast-parser
 async def f() -> int:
     return 0
 reveal_type(f())  # E: Revealed type is 'typing.Awaitable[builtins.int]'
 [builtins fixtures/async_await.pyi]
 
 [case testAwaitCoroutine]
-# options: fast_parser
+# flags: --fast-parser
 async def f() -> int:
     x = await f()
     reveal_type(x)  # E: Revealed type is 'builtins.int*'
@@ -25,7 +25,7 @@ async def f() -> int:
 main: note: In function "f":
 
 [case testAwaitDefaultContext]
-# options: fast_parser
+# flags: --fast-parser
 from typing import TypeVar
 T = TypeVar('T')
 async def f(x: T) -> T:
@@ -37,7 +37,7 @@ main: note: In function "f":
 main:6: error: Revealed type is 'T`-1'
 
 [case testAwaitAnyContext]
-# options: fast_parser
+# flags: --fast-parser
 from typing import Any, TypeVar
 T = TypeVar('T')
 async def f(x: T) -> T:
@@ -49,7 +49,7 @@ main: note: In function "f":
 main:6: error: Revealed type is 'Any'
 
 [case testAwaitExplicitContext]
-# options: fast_parser
+# flags: --fast-parser
 from typing import TypeVar
 T = TypeVar('T')
 async def f(x: T) -> T:
@@ -61,7 +61,7 @@ main:5: error: Argument 1 to "f" has incompatible type "T"; expected "int"
 main:6: error: Revealed type is 'builtins.int'
 
 [case testAwaitGeneratorError]
-# options: fast_parser
+# flags: --fast-parser
 from typing import Any, Generator
 def g() -> Generator[int, None, str]:
     yield 0
@@ -74,7 +74,7 @@ main: note: In function "f":
 main:7: error: Incompatible types in await (actual type Generator[int, None, str], expected type "Awaitable")
 
 [case testAwaitIteratorError]
-# options: fast_parser
+# flags: --fast-parser
 from typing import Any, Iterator
 def g() -> Iterator[Any]:
     yield
@@ -86,7 +86,7 @@ main: note: In function "f":
 main:6: error: Incompatible types in await (actual type Iterator[Any], expected type "Awaitable")
 
 [case testAwaitArgumentError]
-# options: fast_parser
+# flags: --fast-parser
 def g() -> int:
     return 0
 async def f() -> int:
@@ -98,7 +98,7 @@ main: note: In function "f":
 main:5: error: Incompatible types in await (actual type "int", expected type "Awaitable")
 
 [case testAwaitResultError]
-# options: fast_parser
+# flags: --fast-parser
 async def g() -> int:
     return 0
 async def f() -> str:
@@ -109,7 +109,7 @@ main: note: In function "f":
 main:5: error: Incompatible types in assignment (expression has type "int", variable has type "str")
 
 [case testAwaitReturnError]
-# options: fast_parser
+# flags: --fast-parser
 async def g() -> int:
     return 0
 async def f() -> str:
@@ -121,7 +121,7 @@ main: note: In function "f":
 main:6: error: Incompatible return value type (got "int", expected "str")
 
 [case testAsyncFor]
-# options: fast_parser
+# flags: --fast-parser
 from typing import AsyncIterator
 class C(AsyncIterator[int]):
     async def __anext__(self) -> int: return 0
@@ -133,7 +133,7 @@ async def f() -> None:
 main: note: In function "f":
 
 [case testAsyncForError]
-# options: fast_parser
+# flags: --fast-parser
 from typing import AsyncIterator
 async def f() -> None:
     async for x in [1]:
@@ -145,7 +145,7 @@ main:4: error: AsyncIterable expected
 main:4: error: List[int] has no attribute "__aiter__"
 
 [case testAsyncWith]
-# options: fast_parser
+# flags: --fast-parser
 class C:
     async def __aenter__(self) -> int: pass
     async def __aexit__(self, x, y, z) -> None: pass
@@ -157,7 +157,7 @@ async def f() -> None:
 main: note: In function "f":
 
 [case testAsyncWithError]
-# options: fast_parser
+# flags: --fast-parser
 class C:
     def __enter__(self) -> int: pass
     def __exit__(self, x, y, z) -> None: pass
@@ -171,7 +171,7 @@ main:6: error: "C" has no attribute "__aenter__"; maybe "__enter__"?
 main:6: error: "C" has no attribute "__aexit__"; maybe "__exit__"?
 
 [case testAsyncWithErrorBadAenter]
-# options: fast_parser
+# flags: --fast-parser
 class C:
     def __aenter__(self) -> int: pass
     async def __aexit__(self, x, y, z) -> None: pass
@@ -183,7 +183,7 @@ async def f() -> None:
 main: note: In function "f":
 
 [case testAsyncWithErrorBadAenter2]
-# options: fast_parser
+# flags: --fast-parser
 class C:
     def __aenter__(self) -> None: pass
     async def __aexit__(self, x, y, z) -> None: pass
@@ -195,7 +195,7 @@ async def f() -> None:
 main: note: In function "f":
 
 [case testAsyncWithErrorBadAexit]
-# options: fast_parser
+# flags: --fast-parser
 class C:
     async def __aenter__(self) -> int: pass
     def __aexit__(self, x, y, z) -> int: pass
@@ -207,7 +207,7 @@ async def f() -> None:
 main: note: In function "f":
 
 [case testAsyncWithErrorBadAexit2]
-# options: fast_parser
+# flags: --fast-parser
 class C:
     async def __aenter__(self) -> int: pass
     def __aexit__(self, x, y, z) -> None: pass
@@ -219,7 +219,7 @@ async def f() -> None:
 main: note: In function "f":
 
 [case testNoYieldInAsyncDef]
-# options: fast_parser
+# flags: --fast-parser
 async def f():
     yield None
 async def g():
@@ -236,7 +236,7 @@ main: note: In function "h":
 main:7: error: 'yield' in async function
 
 [case testNoYieldFromInAsyncDef]
-# options: fast_parser
+# flags: --fast-parser
 async def f():
     yield from []
 async def g():
@@ -249,12 +249,12 @@ main: note: In function "g":
 main:5: error: 'yield from' in async function
 
 [case testNoAsyncDefInPY2_python2]
-# options: fast_parser
+# flags: --fast-parser
 async def f():  # E: invalid syntax
     pass
 
 [case testYieldFromNoAwaitable]
-# options: fast_parser
+# flags: --fast-parser
 from typing import Any, Generator
 async def f() -> str:
     return ''
@@ -267,7 +267,7 @@ main: note: In function "g":
 main:6: error: "yield from" can't be applied to Awaitable[str]
 
 [case testAwaitableSubclass]
-# options: fast_parser
+# flags: --fast-parser
 from typing import Any, AsyncIterator, Awaitable, Generator
 class A(Awaitable[int]):
     def __await__(self) -> Generator[Any, None, int]:
@@ -295,7 +295,7 @@ async def main() -> None:
 main: note: In function "main":
 
 [case testYieldTypeCheckInDecoratedCoroutine]
-# options: fast_parser
+# flags: --fast-parser
 from typing import Generator
 from types import coroutine
 @coroutine
@@ -316,7 +316,7 @@ main: note: In function "f":
 -- ------------------------------------------
 
 [case testFullCoroutineMatrix]
-# options: fast_parser suppress_error_context
+# flags: --fast-parser --suppress-error-context
 from typing import Any, AsyncIterator, Awaitable, Generator, Iterator
 from types import coroutine
 

test-data/unit/check-expressions.test

@@ -1583,12 +1583,12 @@ None < None  # E: Unsupported left operand type for < (None)
 [builtins fixtures/ops.pyi]
 
 [case testDictWithStarExpr]
-# options: fast_parser
+# flags: --fast-parser
 b = {'z': 26, *a}  # E: invalid syntax
 [builtins fixtures/dict.pyi]
 
 [case testDictWithStarStarExpr]
-# options: fast_parser
+# flags: --fast-parser
 from typing import Dict
 a = {'a': 1}
 b = {'z': 26, **a}