paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-31 03:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

test_helpers: Fix strict_optional errors.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2020-07-04 16:58:06 -07:00
committed by Tim Abbott
parent acd439dee8
commit 813cee3e50
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mypy.ini
View File

@@ -40,8 +40,6 @@ strict_optional = True
# General exclusions to work on # General exclusions to work on
[mypy-zerver.lib.test_helpers]
strict_optional = False
[mypy-zerver.lib.test_classes] [mypy-zerver.lib.test_classes]
strict_optional = False strict_optional = False

13
zerver/lib/test_helpers.py
View File

@@ -123,9 +123,8 @@ def capture_event(event_info: EventInfo) -> Iterator[None]:
event_info.populate(m.call_args_list) event_info.populate(m.call_args_list)
@contextmanager @contextmanager
def simulated_empty_cache() -> Generator[ def simulated_empty_cache() -> Iterator[List[Tuple[str, Union[str, List[str]], Optional[str]]]]:
List[Tuple[str, Union[str, List[str]], str]], None, None]: cache_queries: List[Tuple[str, Union[str, List[str]], Optional[str]]] = []
cache_queries: List[Tuple[str, Union[str, List[str]], str]] = []
def my_cache_get(key: str, cache_name: Optional[str]=None) -> Optional[Dict[str, Any]]: def my_cache_get(key: str, cache_name: Optional[str]=None) -> Optional[Dict[str, Any]]:
cache_queries.append(('get', key, cache_name)) cache_queries.append(('get', key, cache_name))
@@ -202,6 +201,7 @@ def get_test_image_file(filename: str) -> IO[Any]:
def avatar_disk_path(user_profile: UserProfile, medium: bool=False, original: bool=False) -> str: def avatar_disk_path(user_profile: UserProfile, medium: bool=False, original: bool=False) -> str:
avatar_url_path = avatar_url(user_profile, medium) avatar_url_path = avatar_url(user_profile, medium)
assert avatar_url_path is not None
avatar_disk_path = os.path.join(settings.LOCAL_UPLOADS_DIR, "avatars", avatar_disk_path = os.path.join(settings.LOCAL_UPLOADS_DIR, "avatars",
avatar_url_path.split("/")[-2], avatar_url_path.split("/")[-2],
avatar_url_path.split("/")[-1].split("?")[0]) avatar_url_path.split("/")[-1].split("?")[0])
@@ -218,7 +218,10 @@ def find_key_by_email(address: str) -> Optional[str]:
key_regex = re.compile("accounts/do_confirm/([a-z0-9]{24})>") key_regex = re.compile("accounts/do_confirm/([a-z0-9]{24})>")
for message in reversed(outbox): for message in reversed(outbox):
if address in message.to: if address in message.to:
return key_regex.search(message.body).groups()[0] match = key_regex.search(message.body)
assert match is not None
[key] = match.groups()
return key
return None # nocoverage -- in theory a test might want this case, but none do return None # nocoverage -- in theory a test might want this case, but none do
def message_stream_count(user_profile: UserProfile) -> int: def message_stream_count(user_profile: UserProfile) -> int:
@@ -279,7 +282,7 @@ class HostRequestMock:
"""A mock request object where get_host() works. Useful for testing """A mock request object where get_host() works. Useful for testing
routes that use Zulip's subdomains feature""" routes that use Zulip's subdomains feature"""
def __init__(self, user_profile: UserProfile=None, host: str=settings.EXTERNAL_HOST) -> None: def __init__(self, user_profile: Optional[UserProfile]=None, host: str=settings.EXTERNAL_HOST) -> None:
self.host = host self.host = host
self.GET: Dict[str, Any] = {} self.GET: Dict[str, Any] = {}
self.POST: Dict[str, Any] = {} self.POST: Dict[str, Any] = {}