diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-03-23 22:27:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-23 22:27:01 +0000 |
| commit | 9397edb28bb9aa091d71728f24b2765180bda6ba (patch) | |
| tree | 3e9e44ed68ef1fbe1ecc2b39599cd458294c2125 /tests/handlers | |
| parent | Merge pull request #2052 from matrix-org/rav/time_bound_deferred (diff) | |
| parent | fix tests (diff) | |
| download | synapse-9397edb28bb9aa091d71728f24b2765180bda6ba.tar.xz | |
Merge pull request #2050 from matrix-org/rav/federation_backoff
push federation retry limiter down to matrixfederationclient
Diffstat (limited to 'tests/handlers')
| -rw-r--r-- | tests/handlers/test_directory.py | 1 | ||||
| -rw-r--r-- | tests/handlers/test_profile.py | 3 | ||||
| -rw-r--r-- | tests/handlers/test_typing.py | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/tests/handlers/test_directory.py b/tests/handlers/test_directory.py index ceb9aa5765..5712773909 100644 --- a/tests/handlers/test_directory.py +++ b/tests/handlers/test_directory.py @@ -93,6 +93,7 @@ class DirectoryTestCase(unittest.TestCase): "room_alias": "#another:remote", }, retry_on_dns_fail=False, + ignore_backoff=True, ) @defer.inlineCallbacks diff --git a/tests/handlers/test_profile.py b/tests/handlers/test_profile.py index 979cebf600..2a203129ca 100644 --- a/tests/handlers/test_profile.py +++ b/tests/handlers/test_profile.py @@ -119,7 +119,8 @@ class ProfileTestCase(unittest.TestCase): self.mock_federation.make_query.assert_called_with( destination="remote", query_type="profile", - args={"user_id": "@alice:remote", "field": "displayname"} + args={"user_id": "@alice:remote", "field": "displayname"}, + ignore_backoff=True, ) @defer.inlineCallbacks diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py index f88d2be7c5..dbe50383da 100644 --- a/tests/handlers/test_typing.py +++ b/tests/handlers/test_typing.py @@ -192,6 +192,7 @@ class TypingNotificationsTestCase(unittest.TestCase): ), json_data_callback=ANY, long_retries=True, + backoff_on_404=True, ), defer.succeed((200, "OK")) ) @@ -263,6 +264,7 @@ class TypingNotificationsTestCase(unittest.TestCase): ), json_data_callback=ANY, long_retries=True, + backoff_on_404=True, ), defer.succeed((200, "OK")) ) |