summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-01-28 18:26:16 +0000
committerErik Johnston <erik@matrix.org>2016-01-28 18:26:16 +0000
commitf3af1840cbd58a769a856c65de35fba912802e4d (patch)
treee921526099985bc8e8bf52404dd757da8c20e662 /tests
parentPrune on fetching (diff)
parentFix test (diff)
downloadsynapse-f3af1840cbd58a769a856c65de35fba912802e4d.tar.xz
Merge pull request #537 from matrix-org/erikj/cache_filters
Cache user filters.
Diffstat (limited to 'tests')
-rw-r--r--tests/api/test_filtering.py7
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,
         )