pull/6125/head
Brendan Abolivier 2019-09-27 15:21:03 +01:00
parent 0804a27c8c
commit 873fe7883c
No known key found for this signature in database
GPG Key ID: 1E015C145F1916CD
2 changed files with 2 additions and 10 deletions

View File

@ -156,9 +156,7 @@ class DeactivateAccountHandler(BaseHandler):
require_consent=False, require_consent=False,
) )
logger.info( logger.info(
"Rejected invite for user %r in room %r", "Rejected invite for user %r in room %r", user_id, room.room_id
user_id,
room.room_id,
) )
except Exception: except Exception:
logger.exception( logger.exception(

View File

@ -280,12 +280,7 @@ class DeactivateTestCase(unittest.HomeserverTestCase):
# Make @inviter:test invite @invitee:test in a new room. # Make @inviter:test invite @invitee:test in a new room.
room_id = self.helper.create_room_as(inviter_id, tok=inviter_tok) room_id = self.helper.create_room_as(inviter_id, tok=inviter_tok)
self.helper.invite( self.helper.invite(room=room_id, src=inviter_id, targ=invitee_id, tok=inviter_tok)
room=room_id,
src=inviter_id,
targ=invitee_id,
tok=inviter_tok,
)
# Make sure the invite is here. # Make sure the invite is here.
pending_invites = self.get_success(store.get_invited_rooms_for_user(invitee_id)) pending_invites = self.get_success(store.get_invited_rooms_for_user(invitee_id))
@ -322,4 +317,3 @@ class DeactivateTestCase(unittest.HomeserverTestCase):
) )
self.render(request) self.render(request)
self.assertEqual(request.code, 200) self.assertEqual(request.code, 200)