From 949e55f480c892e4d9669bfee2f7a3e7bc0950b7 Mon Sep 17 00:00:00 2001 From: dklimpel <5740567+dklimpel@users.noreply.github.com> Date: Thu, 11 Nov 2021 20:14:35 +0100 Subject: [PATCH] lint and small fixes --- synapse/handlers/pagination.py | 6 +++--- tests/rest/admin/test_room.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/synapse/handlers/pagination.py b/synapse/handlers/pagination.py index 9c1a96ae703c..cd64142735de 100644 --- a/synapse/handlers/pagination.py +++ b/synapse/handlers/pagination.py @@ -122,7 +122,7 @@ class PaginationHandler: """ # when to remove a completed deletion/purge from the results map - CLEAR_PURGE_AFTER_MS = 1000 * 3600 * 24 # 24 hours + CLEAR_PURGE_AFTER_MS = 1000 * 3600 * 24 # 24 hours def __init__(self, hs: "HomeServer"): self.hs = hs @@ -370,7 +370,7 @@ def clear_purge() -> None: del self._purges_by_id[purge_id] self.hs.get_reactor().callLater( - PaginationHandler.CLEAR_PURGE_AFTER_MS/1000, clear_purge + PaginationHandler.CLEAR_PURGE_AFTER_MS / 1000, clear_purge ) def get_purge_status(self, purge_id: str) -> Optional[PurgeStatus]: @@ -660,7 +660,7 @@ def clear_delete() -> None: del self._delete_by_room[room_id] self.hs.get_reactor().callLater( - PaginationHandler.CLEAR_PURGE_AFTER_MS/1000, clear_delete + PaginationHandler.CLEAR_PURGE_AFTER_MS / 1000, clear_delete ) def start_shutdown_and_purge_room( diff --git a/tests/rest/admin/test_room.py b/tests/rest/admin/test_room.py index d72b930d9337..b48fc12e5f91 100644 --- a/tests/rest/admin/test_room.py +++ b/tests/rest/admin/test_room.py @@ -643,7 +643,7 @@ def test_delete_expired_status(self): delete_id1 = channel.json_body["delete_id"] # go ahead - self.reactor.advance(PaginationHandler.CLEAR_PURGE_TIME / 2) + self.reactor.advance(PaginationHandler.CLEAR_PURGE_AFTER_MS / 1000 / 2) # second task channel = self.make_request( @@ -673,7 +673,7 @@ def test_delete_expired_status(self): # get status after more than clearing time for first task # second task is not cleared - self.reactor.advance(PaginationHandler.CLEAR_PURGE_TIME / 2) + self.reactor.advance(PaginationHandler.CLEAR_PURGE_AFTER_MS / 1000 / 2) channel = self.make_request( "GET", @@ -687,7 +687,7 @@ def test_delete_expired_status(self): self.assertEqual(delete_id2, channel.json_body["results"][0]["delete_id"]) # get status after more than clearing time for all tasks - self.reactor.advance(PaginationHandler.CLEAR_PURGE_TIME / 2) + self.reactor.advance(PaginationHandler.CLEAR_PURGE_AFTER_MS / 1000 / 2) channel = self.make_request( "GET",