Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Remove unused mocks from test_typing (#12136)
Browse files Browse the repository at this point in the history
* Remove unused mocks from `test_typing`

It's not clear what these do. `get_user_by_access_token` has the wrong
signature, including the return type. Tests all pass without these. I
think we should nuke them.

* Changelog

* Fixup imports
  • Loading branch information
David Robertson committed Mar 2, 2022
1 parent 2ffaf30 commit 106959b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 31 deletions.
1 change: 1 addition & 0 deletions changelog.d/12136.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove unused mocks from `test_typing`.
32 changes: 1 addition & 31 deletions tests/rest/client/test_typing.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,11 @@
# limitations under the License.

"""Tests REST events for /rooms paths."""
from typing import Any
from unittest.mock import Mock

from twisted.test.proto_helpers import MemoryReactor

from synapse.rest.client import room
from synapse.server import HomeServer
from synapse.storage.databases.main.registration import TokenLookupResult
from synapse.types import UserID
from synapse.util import Clock

Expand All @@ -39,35 +36,8 @@ class RoomTypingTestCase(unittest.HomeserverTestCase):
servlets = [room.register_servlets]

def make_homeserver(self, reactor: MemoryReactor, clock: Clock) -> HomeServer:

hs = self.setup_test_homeserver(
"red",
federation_http_client=None,
federation_client=Mock(),
)

hs = self.setup_test_homeserver("red")
self.event_source = hs.get_event_sources().sources.typing

hs.get_federation_handler = Mock() # type: ignore[assignment]

async def get_user_by_access_token(
token: str,
rights: str = "access",
allow_expired: bool = False,
) -> TokenLookupResult:
return TokenLookupResult(
user_id=self.user_id,
is_guest=False,
token_id=1,
)

hs.get_auth().get_user_by_access_token = get_user_by_access_token # type: ignore[assignment]

async def _insert_client_ip(*args: Any, **kwargs: Any) -> None:
return None

hs.get_datastores().main.insert_client_ip = _insert_client_ip # type: ignore[assignment]

return hs

def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None:
Expand Down

0 comments on commit 106959b

Please sign in to comment.