mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-08 14:43:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Don't check the caches in the renewal test

Browse source
This commit is contained in:
Neil Alexander 2022-07-08 13:30:49 +01:00
parent 629713369e
commit dd49519c3a
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 5 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
federationapi/federationapi_keys_test.go
View file

@ -192,32 +192,7 @@ func TestRenewalBehaviour(t *testing.T) {
t.Fatalf("server C isn't included in the key fetch response") t.Fatalf("server C isn't included in the key fetch response")
} }
// If we ask the cache for the server key for an event that happened originalValidity := res[req].ValidUntilTS
// 90 minutes ago then we should get a cache result, as the key hadn't
// passed its validity by that point. The fact that the key is now in
// the cache is, in itself, proof that we successfully retrieved the
// key before.
oldcached, ok := serverA.cache.GetServerKey(
req,
gomatrixserverlib.AsTimestamp(time.Now().Add(-time.Minute*90)),
)
if !ok {
t.Fatalf("server C key isn't in cache when it should be (-90 minutes)")
}
// If we now ask the cache for the same key but this time for an event
// that only happened 30 minutes ago then we shouldn't get a cached
// result, as the event happened after the key validity expired. This
// is really just for sanity checking.
_, ok = serverA.cache.GetServerKey(
req,
gomatrixserverlib.AsTimestamp(time.Now().Add(-time.Minute*30)),
)
if ok {
t.Fatalf("server B key is in cache when it shouldn't be (-30 minutes)")
}
// We're now going to kick server C into renewing its key. Since we're // We're now going to kick server C into renewing its key. Since we're
// happy at this point that the key that we already have is from the past // happy at this point that the key that we already have is from the past
@ -238,24 +213,13 @@ func TestRenewalBehaviour(t *testing.T) {
if len(res) != 1 { if len(res) != 1 {
t.Fatalf("server C should have returned one key but instead returned %d keys", len(res)) t.Fatalf("server C should have returned one key but instead returned %d keys", len(res))
} }
if _, ok = res[req]; !ok { if _, ok := res[req]; !ok {
t.Fatalf("server C isn't included in the key fetch response") t.Fatalf("server C isn't included in the key fetch response")
} }
// We're now going to ask the cache what the new key validity is. If currentValidity := res[req].ValidUntilTS
// it is still the same as the previous validity then we've failed to
// retrieve the renewed key. If it's newer then we've successfully got
// the renewed key.
newcached, ok := serverA.cache.GetServerKey( if originalValidity == currentValidity {
req, t.Fatalf("server C key should have renewed but didn't")
gomatrixserverlib.AsTimestamp(time.Now().Add(-time.Minute*30)),
)
if !ok {
t.Fatalf("server B key isn't in cache when it shouldn't be (post-renewal)")
} }
if oldcached.ValidUntilTS >= newcached.ValidUntilTS {
t.Fatalf("the server B key should have been renewed but wasn't")
}
t.Log(res)
} }