Merge branch 'release-v1.73' into develop

This commit is contained in:
David Robertson 2022-12-01 13:43:30 +00:00
commit 781b14ec69
No known key found for this signature in database
GPG key ID: 903ECE108A39DEDD
59 changed files with 91 additions and 135 deletions

View file

@ -169,8 +169,6 @@ class ClientIpStoreTestCase(unittest.HomeserverTestCase):
)
)
last_seen = self.clock.time_msec()
if after_persisting:
# Trigger the storage loop
self.reactor.advance(10)
@ -191,7 +189,7 @@ class ClientIpStoreTestCase(unittest.HomeserverTestCase):
"device_id": device_id,
"ip": None,
"user_agent": None,
"last_seen": last_seen,
"last_seen": None,
},
],
)