Skip to content

Add some initial tests for the fast parser #1648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 4, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions mypy/myunit/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,13 @@

from mypy.myunit import main

# In Python 3.3, mypy.__path__ contains a relative path to the mypy module
# (whereas in later Python versions it contains an absolute path). Because the
# test runner changes directories, this breaks non-toplevel mypy imports. We
# fix that problem by fixing up the path to be absolute here.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting that this has not occurred before. I guess mypy so far has carefully avoided delayed imports like this. Hopefully once the fast parser is the only parser we can revert this hack (because I feel kind of bad about it).

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I'd prefer to get rid of this hack too. Interestingly, the fast parser is not the only place where we have a delayed import! We also do it in subtypes and strconv. I guess we just don't hit those codepaths in testing? Yikes...

import os.path
import mypy
# User-defined packages always have __path__ attributes, but mypy doesn't know that.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth filing an issue for.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like there's already one, actually: #1422

mypy.__path__ = [os.path.abspath(p) for p in mypy.__path__] # type: ignore

main()
25 changes: 25 additions & 0 deletions mypy/test/data/check-fastparse.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
[case testFastParseSyntaxError]
# flags: fast-parser
1 + # E: invalid syntax

[case testFastParseTypeCommentSyntaxError]
# flags: fast-parser
x = None # type: a : b # E: syntax error in type comment

[case testFastParseInvalidTypeComment]
# flags: fast-parser
x = None # type: a + b # E: invalid type comment

-- Function type comments are attributed to the function def line.
-- This happens in both parsers.
[case testFastParseFunctionAnnotationSyntaxError]
# flags: fast-parser
def f(): # E: syntax error in type comment
# type: None -> None
pass

[case testFastParseInvalidFunctionAnnotation]
# flags: fast-parser
def f(): # E: invalid type comment
# type: (a + b) -> None
pass
1 change: 1 addition & 0 deletions mypy/test/testcheck.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
'check-flags.test',
'check-incremental.test',
'check-bound.test',
'check-fastparse.test',
]


Expand Down
7 changes: 2 additions & 5 deletions runtests.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def add_basic(driver: Driver) -> None:
driver.add_mypy('legacy myunit script', 'scripts/myunit')
driver.add_flake8('legacy myunit script', 'scripts/myunit')
# needs typed_ast installed:
# driver.add_mypy('fast-parse', '--fast-parse', 'samples/hello.py')
driver.add_mypy('fast-parse', '--fast-parse', 'samples/hello.py')


def add_selftypecheck(driver: Driver) -> None:
Expand Down Expand Up @@ -184,10 +184,7 @@ def add_imports(driver: Driver) -> None:
mod = file_to_module(f)
if '.test.data.' in mod:
continue
# Don't check the importability of the fastparse module because it
# requires typed_ast which may not be available (but which we don't
# want to have an explicit dependency on yet)
if not mod.endswith('.__main__') and not mod.endswith('.fastparse'):
if not mod.endswith('.__main__'):
driver.add_python_string('import %s' % mod, 'import %s' % mod)
driver.add_flake8('module %s' % mod, f)

Expand Down
1 change: 1 addition & 0 deletions test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
flake8
typed-ast