Skip to content

Commit 7018ca0

Browse files
elazarggvanrossum
authored andcommitted
fix filter regression (#3879)
1 parent c1e96f5 commit 7018ca0

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

runtests.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,17 @@ def add_mypy_package(self, name: str, packagename: str, *flags: str) -> None:
8989
def add_mypy_string(self, name: str, *args: str, cwd: Optional[str] = None) -> None:
9090
self.add_mypy_cmd(name, ['-c'] + list(args), cwd=cwd)
9191

92-
def add_pytest(self, name: str, pytest_files: List[str], coverage: bool = True) -> None:
93-
pytest_args = pytest_files + self.arglist + self.pyt_arglist
94-
full_name = 'pytest %s' % name
95-
if not self.allow(full_name):
92+
def add_pytest(self, pytest_files: List[str], coverage: bool = True) -> None:
93+
pytest_files = [name for name in pytest_files if self.allow(name[4:])]
94+
if not pytest_files:
9695
return
96+
pytest_args = pytest_files + self.arglist + self.pyt_arglist
9797
if coverage and self.coverage:
9898
args = [sys.executable, '-m', 'pytest', '--cov=mypy'] + pytest_args
9999
else:
100100
args = [sys.executable, '-m', 'pytest'] + pytest_args
101101

102-
self.waiter.add(LazySubprocess(full_name, args, env=self.env, passthrough=self.verbosity),
102+
self.waiter.add(LazySubprocess('pytest', args, env=self.env, passthrough=self.verbosity),
103103
sequential=True)
104104

105105
def add_python(self, name: str, *args: str, cwd: Optional[str] = None) -> None:
@@ -233,7 +233,7 @@ def test_path(*names: str):
233233

234234

235235
def add_pytest(driver: Driver) -> None:
236-
driver.add_pytest('pytest', PYTEST_FILES)
236+
driver.add_pytest(PYTEST_FILES)
237237

238238

239239
def add_myunit(driver: Driver) -> None:

0 commit comments

Comments
 (0)