diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-03-04 16:35:08 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-03-04 16:35:08 +0000 |
| commit | b7a3be693b06b325d74060df6f809580e1225acd (patch) | |
| tree | 6ccd3c898749e0ea98e820c586895b66cbc626b2 /tests/replication | |
| parent | Merge pull request #625 from matrix-org/erikj/kick_ban_sync (diff) | |
| parent | Prefill from the correct stream (diff) | |
| download | synapse-b7a3be693b06b325d74060df6f809580e1225acd.tar.xz | |
Merge pull request #618 from matrix-org/markjh/pushrule_stream
Add a stream for push rule updates
Diffstat (limited to 'tests/replication')
| -rw-r--r-- | tests/replication/test_resource.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/replication/test_resource.py b/tests/replication/test_resource.py index daabc563b4..4a42eb3365 100644 --- a/tests/replication/test_resource.py +++ b/tests/replication/test_resource.py @@ -35,7 +35,8 @@ class ReplicationResourceCase(unittest.TestCase): "send_message", ]), ) - self.user = UserID.from_string("@seeing:red") + self.user_id = "@seeing:red" + self.user = UserID.from_string(self.user_id) self.hs.get_ratelimiter().send_message.return_value = (True, 0) @@ -101,7 +102,7 @@ class ReplicationResourceCase(unittest.TestCase): event_id = yield self.send_text_message(room_id, "Hello, World") get = self.get(receipts="-1") yield self.hs.get_handlers().receipts_handler.received_client_receipt( - room_id, "m.read", self.user.to_string(), event_id + room_id, "m.read", self.user_id, event_id ) code, body = yield get self.assertEquals(code, 200) @@ -129,6 +130,7 @@ class ReplicationResourceCase(unittest.TestCase): test_timeout_room_account_data = _test_timeout("room_account_data") test_timeout_tag_account_data = _test_timeout("tag_account_data") test_timeout_backfill = _test_timeout("backfill") + test_timeout_push_rules = _test_timeout("push_rules") @defer.inlineCallbacks def send_text_message(self, room_id, message): |