Remove unused mocks from `test_typing` (#12136)
* 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
This commit is contained in:
parent
2ffaf30803
commit
106959b3cf
|
@ -0,0 +1 @@
|
||||||
|
Remove unused mocks from `test_typing`.
|
|
@ -14,14 +14,11 @@
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
"""Tests REST events for /rooms paths."""
|
"""Tests REST events for /rooms paths."""
|
||||||
from typing import Any
|
|
||||||
from unittest.mock import Mock
|
|
||||||
|
|
||||||
from twisted.test.proto_helpers import MemoryReactor
|
from twisted.test.proto_helpers import MemoryReactor
|
||||||
|
|
||||||
from synapse.rest.client import room
|
from synapse.rest.client import room
|
||||||
from synapse.server import HomeServer
|
from synapse.server import HomeServer
|
||||||
from synapse.storage.databases.main.registration import TokenLookupResult
|
|
||||||
from synapse.types import UserID
|
from synapse.types import UserID
|
||||||
from synapse.util import Clock
|
from synapse.util import Clock
|
||||||
|
|
||||||
|
@ -39,35 +36,8 @@ class RoomTypingTestCase(unittest.HomeserverTestCase):
|
||||||
servlets = [room.register_servlets]
|
servlets = [room.register_servlets]
|
||||||
|
|
||||||
def make_homeserver(self, reactor: MemoryReactor, clock: Clock) -> HomeServer:
|
def make_homeserver(self, reactor: MemoryReactor, clock: Clock) -> HomeServer:
|
||||||
|
hs = self.setup_test_homeserver("red")
|
||||||
hs = self.setup_test_homeserver(
|
|
||||||
"red",
|
|
||||||
federation_http_client=None,
|
|
||||||
federation_client=Mock(),
|
|
||||||
)
|
|
||||||
|
|
||||||
self.event_source = hs.get_event_sources().sources.typing
|
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
|
return hs
|
||||||
|
|
||||||
def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None:
|
def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None:
|
||||||
|
|
Loading…
Reference in New Issue