From befccd7d515f98730dbf6f5ff32fe63e6da6ffe4 Mon Sep 17 00:00:00 2001 From: Kegsay Date: Tue, 11 Aug 2020 10:44:59 +0100 Subject: [PATCH 1/2] Reduce cooldown to make sure sytest doesn't give up (#1257) * Reduce cooldown to make sure sytest doesn't give up * More sytests pass weeeeeee --- keyserver/internal/device_list_update.go | 3 ++- sytest-whitelist | 3 +++ 2 files changed, 5 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..4c18775bf 100644 --- a/sytest-whitelist +++ b/sytest-whitelist @@ -139,6 +139,9 @@ 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 +If remote user leaves room, changes device and rejoins we see update in sync +If remote user leaves room, changes device and rejoins we see update in /keys/changes Can add account data Can add account data to room Can get account data without syncing From cce3678abef2bff0e37a2da10f726f550bffdc96 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Tue, 11 Aug 2020 11:58:31 +0100 Subject: [PATCH 2/2] Update whitelist --- sytest-whitelist | 1 + 1 file changed, 1 insertion(+) diff --git a/sytest-whitelist b/sytest-whitelist index 4c18775bf..875cc092d 100644 --- a/sytest-whitelist +++ b/sytest-whitelist @@ -142,6 +142,7 @@ Server correctly handles incoming m.device_list_update Device deletion propagates over federation If remote user leaves room, changes device and rejoins we see update in sync If remote user leaves room, changes device and rejoins we see update in /keys/changes +Can query remote device keys using POST after notification Can add account data Can add account data to room Can get account data without syncing