8000 Refactor testpep561 and add test to address #5767 by chrisphilip322 · Pull Request #5782 · python/mypy · GitHub
[go: up one dir, main page]
Skip to content

Refactor testpep561 and add test to address #5767 #5782

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.

Sign up for GitHub

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 22 commits into from
Oct 17, 2018
Merged

Refactor testpep561 and add test to address #5767 #5782

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2b69726
add testcase which closes #5767
chrisphilip322 Oct 12, 2018
92e7a7d
Only return ns_ancestors in namespace-package mode
Oct 12, 2018
8bee0a3
Might as well use belt and suspenders
Oct 12, 2018
7a33cb3
use windows friendly tempfiles
chrisphilip322 Oct 12, 2018
a0a4959
add test to repro #5784
chrisphilip322 Oct 12, 2018
102cf3b
remove bad testcase
chrisphilip322 Oct 12, 2018
9c577e6
fix typing warning
chrisphilip322 Oct 12, 2018
146c26b
add test to actually reproduce #5784
chrisphilip322 Oct 13, 2018
6122776
Better fix -- roll back the previous attempts in favor of isdir() check
Oct 13, 2018
b02e6db
enhance new test case
chrisphilip322 Oct 13, 2018
7e1e3b2
Merge branch 'fix-regression' of github.com:gvanrossum/mypy into enha…
chrisphilip322 Oct 13, 2018
fa6d6ab
address flake8
chrisphilip322 Oct 13, 2018
ad6952e
add credits to the c extension test file
chrisphilip322 Oct 13, 2018
c166b16
update test to provide actual coverage
chrisphilip322 Oct 14, 2018
f826d15
Merge branch 'master' of https://github.com/python/mypy into enhance-…
chrisphilip322 Oct 14, 2018
f511005
reorganize test files
chrisphilip322 Oct 14, 2018
2cced84
add missing files
chrisphilip322 Oct 14, 2018
e7ab97c
edit expected messages
chrisphilip322 Oct 14, 2018
7513cae
Add test_typedpkg_egg_editable() for completeness
gvanrossum Oct 15, 2018
73c3557
remove unneeded line breaks
chrisphilip322 Oct 15, 2018
62e6f09
Merge branch 'master' of https://github.com/python/mypy into enhance-…
chrisphilip322 Oct 17, 2018
5826e0c
s/ep/prog and s/init/create
chrisphilip322 Oct 17, 2018
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
Prev Previous commit
Next Next commit
use windows friendly tempfiles
  • Loading branch information
@chrisphilip322
chrisphilip322 committed Oct 12, 2018
commit 7a33cb3ec1fa727910c9e6410070c530111126cb
22 changes: 13 additions & 9 deletions mypy/test/testpep561.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import os
import sys
import tempfile
from typing import Tuple, List, Generator, Optional, Mapping, Any
from typing import Tuple, List, Generator, Optional
from unittest import TestCase, main

import mypy.api
Expand Down Expand Up @@ -65,23 +65,27 @@ def create_namespace_program_source(import_style: NamespaceProgramImportStyle) -


class ExampleProgram(object):
_fname = 'test_program.py'

def __init__(self, source_code: str) -> None:
self._source_code = source_code

self._temp_file = None # type: Any
self._temp_dir = None # type: Optional[tempfile.TemporaryDirectory]
self._full_fname = ''

def init(self) -> None:
Copy link
Member

Choose a reason for hiding this comment

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

Suggestion: rename to create? init doesn't really tell me what it is doing, create implies it is doing setup work and creating the test case.

self._temp_file = tempfile.NamedTemporaryFile(mode='w+')
self._temp_file.write(self._source_code)
self._temp_file.flush()
self._temp_dir = tempfile.TemporaryDirectory()
self._full_fname = os.path.join(self._temp_dir.name, self._fname)
with open(self._full_fname, 'w+') as f:
f.write(self._source_code)

def cleanup(self) -> None:
if self._temp_file:
self._temp_file.close()
if self._temp_dir:
self._temp_dir.cleanup()

def build_msg(self, *msgs: Enum) -> str:
return '\n'.join(
msg.value.format(tempfile=self._temp_file.name)
msg.value.format(tempfile=self._full_fname)
for msg in msgs
) + '\n'

Expand All @@ -92,7 +96,7 @@ def check_mypy_run(self,
expected_returncode: int = 1,
venv_dir: Optional[str] = None) -> None:
"""Helper to run mypy and check the output."""
cmd_line = [self._temp_file.name]
cmd_line = [self._full_fname]
if venv_dir is not None:
old_dir = os.getcwd()
os.chdir(venv_dir)
Expand Down
0