diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2020-06-05 10:47:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-05 10:47:20 +0100 |
| commit | f4e6495b5d3267976f34088fa7459b388b801eb6 (patch) | |
| tree | 730d120e39ea4f9e0eb200775578777ebde3f2e8 /tests/rest/client/v1/test_events.py | |
| parent | Fix encryption algorithm typos in tests/comments (#7637) (diff) | |
| download | synapse-f4e6495b5d3267976f34088fa7459b388b801eb6.tar.xz | |
Performance improvements and refactor of Ratelimiter (#7595)
While working on https://github.com/matrix-org/synapse/issues/5665 I found myself digging into the `Ratelimiter` class and seeing that it was both: * Rather undocumented, and * causing a *lot* of config checks This PR attempts to refactor and comment the `Ratelimiter` class, as well as encourage config file accesses to only be done at instantiation. Best to be reviewed commit-by-commit.
Diffstat (limited to 'tests/rest/client/v1/test_events.py')
| -rw-r--r-- | tests/rest/client/v1/test_events.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/rest/client/v1/test_events.py b/tests/rest/client/v1/test_events.py index b54b06482b..f75520877f 100644 --- a/tests/rest/client/v1/test_events.py +++ b/tests/rest/client/v1/test_events.py @@ -15,7 +15,7 @@ """ Tests REST events for /events paths.""" -from mock import Mock, NonCallableMock +from mock import Mock import synapse.rest.admin from synapse.rest.client.v1 import events, login, room @@ -40,11 +40,7 @@ class EventStreamPermissionsTestCase(unittest.HomeserverTestCase): config["enable_registration"] = True config["auto_join_rooms"] = [] - hs = self.setup_test_homeserver( - config=config, ratelimiter=NonCallableMock(spec_set=["can_do_action"]) - ) - self.ratelimiter = hs.get_ratelimiter() - self.ratelimiter.can_do_action.return_value = (True, 0) + hs = self.setup_test_homeserver(config=config) hs.get_handlers().federation_handler = Mock() |