Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

test_runner: Clean up type ignores. 

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg 2019-08-09 15:30:34 -07:00
parent aa384c03a6
commit a0f4c99dad
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zerver/lib/test_runner.py
View File

@ -3,7 +3,7 @@ import random
from typing import Any, Callable, Dict, List, Optional, Set, Tuple, \ from typing import Any, Callable, Dict, List, Optional, Set, Tuple, \
Type, TypeVar, Union Type, TypeVar, Union
from unittest import loader, runner # type: ignore # Mypy cannot pick these up. from unittest import loader, runner
from unittest.result import TestResult from unittest.result import TestResult
from django.conf import settings from django.conf import settings
@ -55,13 +55,13 @@ def slow(slowness_reason: str) -> Callable[[Callable[..., ReturnT]], Callable[..
as attributes of the function. Other code can use this annotation as attributes of the function. Other code can use this annotation
as needed, e.g. to exclude these tests in "fast" mode. as needed, e.g. to exclude these tests in "fast" mode.
''' '''
def decorator(f: Any) -> ReturnT: def decorator(f: Callable[..., ReturnT]) -> Callable[..., ReturnT]:
f.slowness_reason = slowness_reason setattr(f, 'slowness_reason', slowness_reason)
return f return f
return decorator return decorator
def is_known_slow_test(test_method: Any) -> bool: def is_known_slow_test(test_method: Callable[..., ReturnT]) -> bool:
return hasattr(test_method, 'slowness_reason') return hasattr(test_method, 'slowness_reason')
def full_test_name(test: TestCase) -> str: def full_test_name(test: TestCase) -> str:
@ -94,7 +94,7 @@ def report_slow_tests() -> None:
print(' consider removing @slow decorator') print(' consider removing @slow decorator')
print(' This may no longer be true: %s' % (slowness_reason,)) print(' This may no longer be true: %s' % (slowness_reason,))
def enforce_timely_test_completion(test_method: Any, test_name: str, def enforce_timely_test_completion(test_method: Callable[..., ReturnT], test_name: str,
delay: float, result: unittest.TestResult) -> None: delay: float, result: unittest.TestResult) -> None:
if hasattr(test_method, 'slowness_reason'): if hasattr(test_method, 'slowness_reason'):
max_delay = 2.0 # seconds max_delay = 2.0 # seconds
@ -126,7 +126,7 @@ def run_test(test: TestCase, result: TestResult) -> bool:
if not hasattr(test, "_pre_setup"): if not hasattr(test, "_pre_setup"):
msg = "Test doesn't have _pre_setup; something is wrong." msg = "Test doesn't have _pre_setup; something is wrong."
error_pre_setup = (Exception, Exception(msg), None) # type: Tuple[Any, Any, Any] error_pre_setup = (Exception, Exception(msg), None)
result.addError(test, error_pre_setup) result.addError(test, error_pre_setup)
return True return True
test._pre_setup() test._pre_setup()
@ -226,7 +226,7 @@ def run_subsuite(args: SubsuiteArgs) -> Tuple[int, Any]:
from django.db.backends.postgresql.creation import DatabaseCreation from django.db.backends.postgresql.creation import DatabaseCreation
def _replacement_destroy_test_db(self: DatabaseCreation, def _replacement_destroy_test_db(self: DatabaseCreation,
test_database_name: str, test_database_name: str,
verbosity: Any) -> None: verbosity: int) -> None:
"""Replacement for Django's _destroy_test_db that removes the """Replacement for Django's _destroy_test_db that removes the
unnecessary sleep(1).""" unnecessary sleep(1)."""
with self.connection._nodb_connection.cursor() as cursor: with self.connection._nodb_connection.cursor() as cursor: