From f94e50b2084fdcfd629301e9b00b790b5df804d8 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Tue, 11 Aug 2020 10:16:55 +0100 Subject: [PATCH] Reduce cooldown to make sure sytest doesn't give up --- keyserver/internal/device_list_update.go | 3 ++- sytest-whitelist | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/keyserver/internal/device_list_update.go b/keyserver/internal/device_list_update.go index ec7dff560..c4b098a4d 100644 --- a/keyserver/internal/device_list_update.go +++ b/keyserver/internal/device_list_update.go @@ -222,7 +222,8 @@ func (u *DeviceListUpdater) worker(ch chan gomatrixserverlib.ServerName) { // last made a request to the server. If we get the server name during the cooloff // period, we'll ignore the poke. lastProcessed := make(map[gomatrixserverlib.ServerName]time.Time) - cooloffPeriod := time.Minute + // this can't be too long else sytest will give up trying to do a test + cooloffPeriod := 500 * time.Millisecond shouldProcess := func(srv gomatrixserverlib.ServerName) bool { // we should process requests when now is after the last process time + cooloff return time.Now().After(lastProcessed[srv].Add(cooloffPeriod)) diff --git a/sytest-whitelist b/sytest-whitelist index a726e51e8..48bf7c08f 100644 --- a/sytest-whitelist +++ b/sytest-whitelist @@ -139,6 +139,7 @@ Get left notifs for other users in sync and /keys/changes when user leaves Local device key changes get to remote servers Local device key changes get to remote servers with correct prev_id Server correctly handles incoming m.device_list_update +Device deletion propagates over federation Can add account data Can add account data to room Can get account data without syncing