2 files changed, 7 insertions, 7 deletions
diff --git a/tests/api/test_filtering.py b/tests/api/test_filtering.py
index 65b2f590c8..6942cdac51 100644
--- a/tests/api/test_filtering.py
+++ b/tests/api/test_filtering.py
@@ -345,9 +345,9 @@ class FilteringTestCase(unittest.TestCase):
)
@defer.inlineCallbacks
- def test_filter_public_user_data_match(self):
+ def test_filter_presence_match(self):
user_filter_json = {
- "public_user_data": {
+ "presence": {
"types": ["m.*"]
}
}
@@ -368,13 +368,13 @@ class FilteringTestCase(unittest.TestCase):
filter_id=filter_id,
)
- results = user_filter.filter_public_user_data(events=events)
+ results = user_filter.filter_presence(events=events)
self.assertEquals(events, results)
@defer.inlineCallbacks
- def test_filter_public_user_data_no_match(self):
+ def test_filter_presence_no_match(self):
user_filter_json = {
- "public_user_data": {
+ "presence": {
"types": ["m.*"]
}
}
@@ -395,7 +395,7 @@ class FilteringTestCase(unittest.TestCase):
filter_id=filter_id,
)
- results = user_filter.filter_public_user_data(events=events)
+ results = user_filter.filter_presence(events=events)
self.assertEquals([], results)
@defer.inlineCallbacks
diff --git a/tests/utils.py b/tests/utils.py
index dd19a16fc7..4da51291a4 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -16,7 +16,7 @@
from synapse.http.server import HttpServer
from synapse.api.errors import cs_error, CodeMessageException, StoreError
from synapse.api.constants import EventTypes
-from synapse.storage import prepare_database
+from synapse.storage.prepare_database import prepare_database
from synapse.storage.engines import create_engine
from synapse.server import HomeServer
|
