diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py
index f4cf54b7ee..a92d825f49 100644
--- a/tests/handlers/test_federation.py
+++ b/tests/handlers/test_federation.py
@@ -99,7 +99,6 @@ class FederationTestCase(unittest.TestCase):
new_event = mem_handler.change_membership.call_args[0][0]
self.assertEquals(RoomMemberEvent.TYPE, new_event.type)
self.assertEquals(room_id, new_event.room_id)
- self.assertEquals(user_id, new_event.target_user_id)
self.assertEquals(user_id, new_event.state_key)
self.assertEquals(Membership.JOIN, new_event.membership)
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py
index 8b88c49a0b..6d3cd76dba 100644
--- a/tests/handlers/test_presence.py
+++ b/tests/handlers/test_presence.py
@@ -190,6 +190,7 @@ class PresenceStateTestCase(unittest.TestCase):
),
SynapseError
)
+ test_get_disallowed_state.skip = "Presence polling is disabled"
@defer.inlineCallbacks
def test_set_my_state(self):
@@ -214,6 +215,7 @@ class PresenceStateTestCase(unittest.TestCase):
state={"state": OFFLINE})
self.mock_stop.assert_called_with(self.u_apple)
+ test_set_my_state.skip = "Presence polling is disabled"
class PresenceInvitesTestCase(unittest.TestCase):
@@ -653,6 +655,7 @@ class PresencePushTestCase(unittest.TestCase):
observed_user=self.u_banana,
statuscache=ANY), # self-reflection
]) # and no others...
+ test_push_local.skip = "Presence polling is disabled"
@defer.inlineCallbacks
def test_push_remote(self):
@@ -704,6 +707,7 @@ class PresencePushTestCase(unittest.TestCase):
)
yield put_json.await_calls()
+ test_push_remote.skip = "Presence polling is disabled"
@defer.inlineCallbacks
def test_recv_remote(self):
@@ -996,6 +1000,8 @@ class PresencePollingTestCase(unittest.TestCase):
self.assertFalse("banana" in self.handler._local_pushmap)
self.assertFalse("clementine" in self.handler._local_pushmap)
+ test_push_local.skip = "Presence polling is disabled"
+
@defer.inlineCallbacks
def test_remote_poll_send(self):
@@ -1044,6 +1050,7 @@ class PresencePollingTestCase(unittest.TestCase):
put_json.await_calls()
self.assertFalse(self.u_potato in self.handler._remote_recvmap)
+ test_remote_poll_send.skip = "Presence polling is disabled"
@defer.inlineCallbacks
def test_remote_poll_receive(self):
diff --git a/tests/handlers/test_presencelike.py b/tests/handlers/test_presencelike.py
index bba5dd4e53..c25c6889be 100644
--- a/tests/handlers/test_presencelike.py
+++ b/tests/handlers/test_presencelike.py
@@ -135,6 +135,7 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase):
mocked_set.assert_called_with("apple",
{"state": UNAVAILABLE, "status_msg": "Away"})
+ test_set_my_state.skip = "Presence polling is disabled"
@defer.inlineCallbacks
def test_push_local(self):
@@ -209,6 +210,8 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase):
"displayname": "I am an Apple",
"avatar_url": "http://foo",
}, statuscache.state)
+ test_push_local.skip = "Presence polling is disabled"
+
@defer.inlineCallbacks
def test_push_remote(self):
@@ -239,6 +242,7 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase):
],
},
)
+ test_push_remote.skip = "Presence polling is disabled"
@defer.inlineCallbacks
def test_recv_remote(self):
diff --git a/tests/handlers/test_room.py b/tests/handlers/test_room.py
index 9ab4096438..a1ab8dde68 100644
--- a/tests/handlers/test_room.py
+++ b/tests/handlers/test_room.py
@@ -90,7 +90,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
event = self.hs.get_event_factory().create_event(
etype=RoomMemberEvent.TYPE,
user_id=user_id,
- target_user_id=target_user_id,
+ state_key=target_user_id,
room_id=room_id,
membership=Membership.INVITE,
content=content,
@@ -143,7 +143,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
event = self.hs.get_event_factory().create_event(
etype=RoomMemberEvent.TYPE,
user_id=user_id,
- target_user_id=target_user_id,
+ state_key=target_user_id,
room_id=room_id,
membership=Membership.JOIN,
content=content,
@@ -374,7 +374,7 @@ class RoomCreationTest(unittest.TestCase):
self.assertEquals(RoomMemberEvent.TYPE, join_event.type)
self.assertEquals(room_id, join_event.room_id)
self.assertEquals(user_id, join_event.user_id)
- self.assertEquals(user_id, join_event.target_user_id)
+ self.assertEquals(user_id, join_event.state_key)
self.assertTrue(self.state_handler.handle_new_event.called)
|
