summary refs log tree commit diff
path: root/tests/api
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-01-25 13:12:35 +0000
committerErik Johnston <erik@matrix.org>2016-01-25 13:12:35 +0000
commit8c6012a4af4973b0a53af65a31cbdb92a3dec5a2 (patch)
treec43d86def63ed5b084dfb63b626bf39dc2d4cdd0 /tests/api
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/sync (diff)
downloadsynapse-8c6012a4af4973b0a53af65a31cbdb92a3dec5a2.tar.xz
Fix tests
Diffstat (limited to 'tests/api')
-rw-r--r--tests/api/test_filtering.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/api/test_filtering.py b/tests/api/test_filtering.py

index 16ee6bbe6a..1a4e439d30 100644 --- a/tests/api/test_filtering.py +++ b/tests/api/test_filtering.py
@@ -13,26 +13,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -from collections import namedtuple from tests import unittest from twisted.internet import defer -from mock import Mock, NonCallableMock +from mock import Mock from tests.utils import ( MockHttpResource, DeferredMockCallable, setup_test_homeserver ) from synapse.types import UserID -from synapse.api.filtering import FilterCollection, Filter +from synapse.api.filtering import Filter +from synapse.events import FrozenEvent user_localpart = "test_user" # MockEvent = namedtuple("MockEvent", "sender type room_id") def MockEvent(**kwargs): - ev = NonCallableMock(spec_set=kwargs.keys()) - ev.configure_mock(**kwargs) - return ev + return FrozenEvent(kwargs) class FilteringTestCase(unittest.TestCase):