Fix bug in store defer. Add more unit tests.

1 files changed, 1 insertions, 5 deletions

diff --git a/tests/handlers/test_appservice.py b/tests/handlers/test_appservice.py

index 9c464e7fbc..1daa314f20 100644
--- a/tests/handlers/test_appservice.py
+++ b/tests/handlers/test_appservice.py
@@ -18,12 +18,8 @@ from .. import unittest
 
 from synapse.handlers.appservice import ApplicationServicesHandler
 
-from collections import namedtuple
 from mock import Mock
 
-# TODO: Should this be a more general thing? tests/api/test_filtering.py uses it
-MockEvent = namedtuple("MockEvent", "sender type room_id")
-
 
 class AppServiceHandlerTestCase(unittest.TestCase):
     """ Tests the ApplicationServicesHandler. """
@@ -51,7 +47,7 @@ class AppServiceHandlerTestCase(unittest.TestCase):
 
         self.mock_store.get_app_services = Mock(return_value=services)
 
-        event = MockEvent(
+        event = Mock(
             sender="@someone:anywhere",
             type="m.room.message",
             room_id="!foo:bar"