summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-01-25 12:35:25 +0000
committerErik Johnston <erik@matrix.org>2016-01-25 12:35:25 +0000
commitd685ae73b481d1503324b09b57583a867b3fa8df (patch)
treece7fde3d2b93e116a042ce63dfcdacd5d23c537a /tests
parentMerge pull request #523 from matrix-org/dbkr/no_push_unless_notify (diff)
parentFix tests (diff)
downloadsynapse-d685ae73b481d1503324b09b57583a867b3fa8df.tar.xz
Merge branch 'erikj/filters' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'tests')
-rw-r--r--tests/api/test_filtering.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/api/test_filtering.py b/tests/api/test_filtering.py
index 14cddee679..16ee6bbe6a 100644
--- a/tests/api/test_filtering.py
+++ b/tests/api/test_filtering.py
@@ -504,4 +504,4 @@ class FilteringTestCase(unittest.TestCase):
             filter_id=filter_id,
         )
 
-        self.assertEquals(filter.filter_json, user_filter_json)
+        self.assertEquals(filter.get_filter_json(), user_filter_json)