diff --git a/tests/handlers/test_directory.py b/tests/handlers/test_directory.py
index 72a2b1443a..54d6e51f97 100644
--- a/tests/handlers/test_directory.py
+++ b/tests/handlers/test_directory.py
@@ -14,11 +14,10 @@
# limitations under the License.
-from twisted.trial import unittest
+from tests import unittest
from twisted.internet import defer
from mock import Mock
-import logging
from synapse.server import HomeServer
from synapse.http.client import HttpClient
@@ -26,9 +25,6 @@ from synapse.handlers.directory import DirectoryHandler
from synapse.storage.directory import RoomAliasMapping
-logging.getLogger().addHandler(logging.NullHandler())
-
-
class DirectoryHandlers(object):
def __init__(self, hs):
self.directory_handler = DirectoryHandler(hs)
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py
index 6fc3d8f7fd..eb6b7c22ef 100644
--- a/tests/handlers/test_federation.py
+++ b/tests/handlers/test_federation.py
@@ -14,7 +14,7 @@
from twisted.internet import defer
-from twisted.trial import unittest
+from tests import unittest
from synapse.api.events.room import (
InviteJoinEvent, MessageEvent, RoomMemberEvent
@@ -26,12 +26,8 @@ from synapse.federation.units import Pdu
from mock import NonCallableMock, ANY
-import logging
-
from ..utils import get_mock_call_args
-logging.getLogger().addHandler(logging.NullHandler())
-
class FederationTestCase(unittest.TestCase):
@@ -78,7 +74,9 @@ class FederationTestCase(unittest.TestCase):
yield self.handlers.federation_handler.on_receive_pdu(pdu, False)
- self.datastore.persist_event.assert_called_once_with(ANY, False)
+ self.datastore.persist_event.assert_called_once_with(
+ ANY, False, is_new_state=False
+ )
self.notifier.on_new_room_event.assert_called_once_with(ANY)
@defer.inlineCallbacks
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py
index 9eb8b6909f..0cb4dfba39 100644
--- a/tests/handlers/test_presence.py
+++ b/tests/handlers/test_presence.py
@@ -14,11 +14,10 @@
# limitations under the License.
-from twisted.trial import unittest
+from tests import unittest
from twisted.internet import defer, reactor
from mock import Mock, call, ANY
-import logging
import json
from ..utils import MockHttpResource, MockClock, DeferredMockCallable
@@ -34,9 +33,6 @@ UNAVAILABLE = PresenceState.UNAVAILABLE
ONLINE = PresenceState.ONLINE
-logging.getLogger().addHandler(logging.NullHandler())
-
-
def _expect_edu(destination, edu_type, content, origin="test"):
return {
"origin": origin,
@@ -92,7 +88,6 @@ class PresenceStateTestCase(unittest.TestCase):
# Mock the RoomMemberHandler
room_member_handler = Mock(spec=[])
hs.handlers.room_member_handler = room_member_handler
- logging.getLogger().debug("Mocking room_member_handler=%r", room_member_handler)
# Some local users to test with
self.u_apple = hs.parse_userid("@apple:test")
@@ -324,7 +319,8 @@ class PresenceInvitesTestCase(unittest.TestCase):
"observer_user": "@apple:test",
"observed_user": "@cabbage:elsewhere",
}
- )
+ ),
+ on_send_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -350,7 +346,8 @@ class PresenceInvitesTestCase(unittest.TestCase):
"observer_user": "@cabbage:elsewhere",
"observed_user": "@apple:test",
}
- )
+ ),
+ on_send_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -381,7 +378,8 @@ class PresenceInvitesTestCase(unittest.TestCase):
"observer_user": "@cabbage:elsewhere",
"observed_user": "@durian:test",
}
- )
+ ),
+ on_send_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -770,7 +768,8 @@ class PresencePushTestCase(unittest.TestCase):
"last_active_ago": 0},
],
}
- )
+ ),
+ on_send_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -785,7 +784,8 @@ class PresencePushTestCase(unittest.TestCase):
"last_active_ago": 0},
],
}
- )
+ ),
+ on_send_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -911,6 +911,7 @@ class PresencePushTestCase(unittest.TestCase):
],
}
),
+ on_send_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -925,6 +926,7 @@ class PresencePushTestCase(unittest.TestCase):
],
}
),
+ on_send_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -954,6 +956,7 @@ class PresencePushTestCase(unittest.TestCase):
],
}
),
+ on_send_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -1150,6 +1153,7 @@ class PresencePollingTestCase(unittest.TestCase):
"poll": [ "@potato:remote" ],
},
),
+ on_send_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -1162,6 +1166,7 @@ class PresencePollingTestCase(unittest.TestCase):
"push": [ {"user_id": "@clementine:test" }],
},
),
+ on_send_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -1190,6 +1195,7 @@ class PresencePollingTestCase(unittest.TestCase):
"push": [ {"user_id": "@fig:test" }],
},
),
+ on_send_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -1222,6 +1228,7 @@ class PresencePollingTestCase(unittest.TestCase):
"unpoll": [ "@potato:remote" ],
},
),
+ on_send_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -1253,6 +1260,7 @@ class PresencePollingTestCase(unittest.TestCase):
],
},
),
+ on_send_callback=ANY,
),
defer.succeed((200, "OK"))
)
diff --git a/tests/handlers/test_presencelike.py b/tests/handlers/test_presencelike.py
index b35980d948..047752ad68 100644
--- a/tests/handlers/test_presencelike.py
+++ b/tests/handlers/test_presencelike.py
@@ -16,11 +16,10 @@
"""This file contains tests of the "presence-like" data that is shared between
presence and profiles; namely, the displayname and avatar_url."""
-from twisted.trial import unittest
+from tests import unittest
from twisted.internet import defer
from mock import Mock, call, ANY
-import logging
from ..utils import MockClock
@@ -35,9 +34,6 @@ UNAVAILABLE = PresenceState.UNAVAILABLE
ONLINE = PresenceState.ONLINE
-logging.getLogger().addHandler(logging.NullHandler())
-
-
class MockReplication(object):
def __init__(self):
self.edu_handlers = {}
@@ -69,6 +65,8 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase):
"is_presence_visible",
"set_profile_displayname",
+
+ "get_rooms_for_user_where_membership_is",
]),
handlers=None,
resource_for_federation=Mock(),
@@ -136,6 +134,10 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase):
# Remote user
self.u_potato = hs.parse_userid("@potato:remote")
+ self.mock_get_joined = (
+ self.datastore.get_rooms_for_user_where_membership_is
+ )
+
@defer.inlineCallbacks
def test_set_my_state(self):
self.presence_list = [
@@ -156,6 +158,11 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase):
@defer.inlineCallbacks
def test_push_local(self):
+ def get_joined(*args):
+ return defer.succeed([])
+
+ self.mock_get_joined.side_effect = get_joined
+
self.presence_list = [
{"observed_user_id": "@banana:test"},
{"observed_user_id": "@clementine:test"},
diff --git a/tests/handlers/test_profile.py b/tests/handlers/test_profile.py
index 8e7a89b479..ee2be9b6d5 100644
--- a/tests/handlers/test_profile.py
+++ b/tests/handlers/test_profile.py
@@ -14,18 +14,15 @@
# limitations under the License.
-from twisted.trial import unittest
+from tests import unittest
from twisted.internet import defer
from mock import Mock
-import logging
from synapse.api.errors import AuthError
from synapse.server import HomeServer
from synapse.handlers.profile import ProfileHandler
-
-
-logging.getLogger().addHandler(logging.NullHandler())
+from synapse.api.constants import Membership
class ProfileHandlers(object):
@@ -54,6 +51,7 @@ class ProfileTestCase(unittest.TestCase):
"set_profile_displayname",
"get_profile_avatar_url",
"set_profile_avatar_url",
+ "get_rooms_for_user_where_membership_is",
]),
handlers=None,
resource_for_federation=Mock(),
@@ -69,6 +67,10 @@ class ProfileTestCase(unittest.TestCase):
self.handler = hs.get_handlers().profile_handler
+ self.mock_get_joined = (
+ self.datastore.get_rooms_for_user_where_membership_is
+ )
+
# TODO(paul): Icky signal declarings.. booo
hs.get_distributor().declare("changed_presencelike_data")
@@ -87,8 +89,15 @@ class ProfileTestCase(unittest.TestCase):
mocked_set = self.datastore.set_profile_displayname
mocked_set.return_value = defer.succeed(())
+ self.mock_get_joined.return_value = defer.succeed([])
+
yield self.handler.set_displayname(self.frank, self.frank, "Frank Jr.")
+ self.mock_get_joined.assert_called_once_with(
+ self.frank.to_string(),
+ [Membership.JOIN]
+ )
+
mocked_set.assert_called_with("1234ABCD", "Frank Jr.")
@defer.inlineCallbacks
@@ -139,7 +148,15 @@ class ProfileTestCase(unittest.TestCase):
mocked_set = self.datastore.set_profile_avatar_url
mocked_set.return_value = defer.succeed(())
+ self.mock_get_joined.return_value = defer.succeed([])
+
yield self.handler.set_avatar_url(self.frank, self.frank,
"http://my.server/pic.gif")
+ self.mock_get_joined.assert_called_once_with(
+ self.frank.to_string(),
+ [Membership.JOIN]
+ )
+
+
mocked_set.assert_called_with("1234ABCD", "http://my.server/pic.gif")
diff --git a/tests/handlers/test_room.py b/tests/handlers/test_room.py
index 5687bbea0b..a1a2e80492 100644
--- a/tests/handlers/test_room.py
+++ b/tests/handlers/test_room.py
@@ -15,7 +15,7 @@
from twisted.internet import defer
-from twisted.trial import unittest
+from tests import unittest
from synapse.api.events.room import (
InviteJoinEvent, RoomMemberEvent, RoomConfigEvent
@@ -27,10 +27,6 @@ from synapse.server import HomeServer
from mock import Mock, NonCallableMock
-import logging
-
-logging.getLogger().addHandler(logging.NullHandler())
-
class RoomMemberHandlerTestCase(unittest.TestCase):
diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py
index 6532ac94a3..a66f208abf 100644
--- a/tests/handlers/test_typing.py
+++ b/tests/handlers/test_typing.py
@@ -14,12 +14,11 @@
# limitations under the License.
-from twisted.trial import unittest
+from tests import unittest
from twisted.internet import defer
from mock import Mock, call, ANY
import json
-import logging
from ..utils import MockHttpResource, MockClock, DeferredMockCallable
@@ -27,9 +26,6 @@ from synapse.server import HomeServer
from synapse.handlers.typing import TypingNotificationHandler
-logging.getLogger().addHandler(logging.NullHandler())
-
-
def _expect_edu(destination, edu_type, content, origin="test"):
return {
"origin": origin,
@@ -173,7 +169,8 @@ class TypingNotificationsTestCase(unittest.TestCase):
"user_id": self.u_apple.to_string(),
"typing": True,
}
- )
+ ),
+ on_send_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -223,7 +220,8 @@ class TypingNotificationsTestCase(unittest.TestCase):
"user_id": self.u_apple.to_string(),
"typing": False,
}
- )
+ ),
+ on_send_callback=ANY,
),
defer.succeed((200, "OK"))
)
|
