Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Convert delete room admin API to async endpoint #11223

Merged
merged 28 commits into from
Nov 12, 2021
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
c35a367
Convert delete room admin API to async endpoint
dklimpel Oct 31, 2021
69bba24
newsfile
dklimpel Oct 31, 2021
a9f9e3a
disable flaky test
dklimpel Oct 31, 2021
9d381cf
Merge branch 'develop' into delete_room_bg
dklimpel Nov 1, 2021
6ddcc8e
Fix wrong unit test `test_block_room_and_not_purge`
dklimpel Nov 1, 2021
cf8b612
Apply suggestions from code review
dklimpel Nov 1, 2021
a37b09c
update docstrings and mark private fields with `_`
dklimpel Nov 2, 2021
5b24839
Merge remote-tracking branch 'synapse/develop' into delete_room_bg
dklimpel Nov 2, 2021
3f9a4f4
Reuse `RoomShutdownHandler.shutdown_room`
dklimpel Nov 2, 2021
a482170
Merge remote-tracking branch 'synapse/develop' into delete_room_bg
dklimpel Nov 3, 2021
2f1f483
try flaky unit test
dklimpel Nov 3, 2021
60ef11e
rework request of purge status
dklimpel Nov 4, 2021
76a62d5
add error message if delete fails
dklimpel Nov 8, 2021
7de0bf1
Apply suggestions from code review
dklimpel Nov 8, 2021
a618958
add simple unit test for `/purge_history_status`
dklimpel Nov 8, 2021
4f42348
rename response dicts
dklimpel Nov 8, 2021
5a764c8
add new status API `/rooms/delete_status/<purge_id>`
dklimpel Nov 8, 2021
32c0694
update doc
dklimpel Nov 8, 2021
7821ed2
update docstring
dklimpel Nov 8, 2021
fb2019d
Merge remote-tracking branch 'synapse/develop' into delete_room_bg
dklimpel Nov 9, 2021
3b3cf2a
fix merge
dklimpel Nov 9, 2021
bd70ffd
update test response code, introduced in #11228
dklimpel Nov 9, 2021
383d808
Merge remote-tracking branch 'synapse/develop' into delete_room_bg
dklimpel Nov 9, 2021
05dd106
make compatible with #11228
dklimpel Nov 9, 2021
11d9e87
rename status
dklimpel Nov 9, 2021
fea716f
separate `purge` and `delete`
dklimpel Nov 10, 2021
1e5c5a4
Apply suggestions from code review
dklimpel Nov 11, 2021
949e55f
lint and small fixes
dklimpel Nov 11, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions tests/rest/admin/test_room.py
Original file line number Diff line number Diff line change
Expand Up @@ -687,6 +687,8 @@ def test_delete_same_room_twice(self):
self.assertEqual(200, status_channel.code, msg=status_channel.json_body)
self.assertEqual("complete", status_channel.json_body["status"])

test_delete_same_room_twice.skip = "Disabled by default because it's flaky"
dklimpel marked this conversation as resolved.
Show resolved Hide resolved

def test_purge_room_and_block(self):
"""Test to purge a room and block it.
Members will not be moved to a new room and will not receive a message.
Expand Down