Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Timo Ley
synapse
Commits
873fe788
Unverified
Commit
873fe788
authored
5 years ago
by
Brendan Abolivier
Browse files
Options
Downloads
Patches
Plain Diff
Lint
parent
0804a27c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
synapse/handlers/deactivate_account.py
+1
-3
1 addition, 3 deletions
synapse/handlers/deactivate_account.py
tests/rest/client/v2_alpha/test_account.py
+1
-7
1 addition, 7 deletions
tests/rest/client/v2_alpha/test_account.py
with
2 additions
and
10 deletions
synapse/handlers/deactivate_account.py
+
1
−
3
View file @
873fe788
...
@@ -156,9 +156,7 @@ class DeactivateAccountHandler(BaseHandler):
...
@@ -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
(
...
...
This diff is collapsed.
Click to expand it.
tests/rest/client/v2_alpha/test_account.py
+
1
−
7
View file @
873fe788
...
@@ -280,12 +280,7 @@ class DeactivateTestCase(unittest.HomeserverTestCase):
...
@@ -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):
...
@@ -322,4 +317,3 @@ class DeactivateTestCase(unittest.HomeserverTestCase):
)
)
self
.
render
(
request
)
self
.
render
(
request
)
self
.
assertEqual
(
request
.
code
,
200
)
self
.
assertEqual
(
request
.
code
,
200
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment