paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-28 18:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

test_runner: Unionize suite type.

Browse Source 
Mypy cannot see the class hierarchy pertaining to django's
ParallelTestSuite. To deal with this, we simply create a
`Union` of our two types.
This commit is contained in:
Wyatt Hoodes
2019-07-30 09:04:10 -10:00
committed by Tim Abbott
parent 4beec5c6b9
commit 167d0bad61
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zerver/lib/test_runner.py
View File

@@ -3,7 +3,7 @@ from functools import partial
import random
from typing import Any, Callable, Dict, List, Optional, Set, Tuple, \
Type, cast, TypeVar
Type, TypeVar, Union
from unittest import loader, runner # type: ignore # Mypy cannot pick these up.
from unittest.result import TestResult
@@ -489,7 +489,7 @@ class Runner(DiscoverRunner):
pass
return super().teardown_test_environment(*args, **kwargs)
def test_imports(self, test_labels: List[str], suite: unittest.TestSuite) -> None:
def test_imports(self, test_labels: List[str], suite: Union[TestSuite, ParallelTestSuite]) -> None:
prefix_old = 'unittest.loader.ModuleImportFailure.' # Python <= 3.4
prefix_new = 'unittest.loader._FailedTest.' # Python > 3.4
error_prefixes = [prefix_old, prefix_new]
@@ -560,7 +560,7 @@ class Runner(DiscoverRunner):
write_instrumentation_reports(full_suite=full_suite, include_webhooks=include_webhooks)
return failed, result.failed_tests
def get_test_names(suite: unittest.TestSuite) -> List[str]:
def get_test_names(suite: Union[TestSuite, ParallelTestSuite]) -> List[str]:
if isinstance(suite, ParallelTestSuite):
# suite is ParallelTestSuite. It will have a subsuites parameter of
# type SubSuiteList. Each element of a SubsuiteList is a tuple whose
@@ -569,7 +569,6 @@ def get_test_names(suite: unittest.TestSuite) -> List[str]:
# implementation details.
return [name for subsuite in suite.subsuites for name in subsuite[1]]
else:
suite = cast(TestSuite, suite)
return [full_test_name(t) for t in get_tests_from_suite(suite)]
def get_tests_from_suite(suite: unittest.TestSuite) -> TestCase: