diff options
author | Erik Johnston <erik@matrix.org> | 2016-01-29 13:52:12 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-01-29 13:52:12 +0000 |
commit | fd142c29d9af53fe76dcf0cb4e1ebe7aac5d28f2 (patch) | |
tree | fd4650925097b4014e8ce32619ab4956a0a89879 /tests/api | |
parent | Bump version and changelog (diff) | |
parent | Bump AccountDataAndTagsChangeCache size (diff) | |
download | synapse-fd142c29d9af53fe76dcf0cb4e1ebe7aac5d28f2.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.12.1
Diffstat (limited to 'tests/api')
-rw-r--r-- | tests/api/test_filtering.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/api/test_filtering.py b/tests/api/test_filtering.py index 1a4e439d30..ceb0089268 100644 --- a/tests/api/test_filtering.py +++ b/tests/api/test_filtering.py @@ -382,19 +382,20 @@ class FilteringTestCase(unittest.TestCase): "types": ["m.*"] } } - user = UserID.from_string("@" + user_localpart + ":test") + filter_id = yield self.datastore.add_user_filter( - user_localpart=user_localpart, + user_localpart=user_localpart + "2", user_filter=user_filter_json, ) event = MockEvent( + event_id="$asdasd:localhost", sender="@foo:bar", type="custom.avatar.3d.crazy", ) events = [event] user_filter = yield self.filtering.get_user_filter( - user_localpart=user_localpart, + user_localpart=user_localpart + "2", filter_id=filter_id, ) |