sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Fix flakey test

Browse source
This commit is contained in:
Till Faelligen 2022-12-22 11:31:54 +01:00
parent d3db542fbf
commit beea2432e6
No known key found for this signature in database
GPG key ID: ACCDC9606D472758
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
federationapi/storage/tables/inbound_peeks_table_test.go
View file

@ -13,6 +13,7 @@ import (
"github.com/matrix-org/dendrite/test" "github.com/matrix-org/dendrite/test"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/util" "github.com/matrix-org/util"
"github.com/stretchr/testify/assert"
) )
func mustCreateInboundpeeksTable(t *testing.T, dbType test.DBType) (tables.FederationInboundPeeks, func()) { func mustCreateInboundpeeksTable(t *testing.T, dbType test.DBType) (tables.FederationInboundPeeks, func()) {
@ -124,11 +125,11 @@ func TestInboundPeeksTable(t *testing.T) {
if len(inboundPeeks) != len(peekIDs) { if len(inboundPeeks) != len(peekIDs) {
t.Fatalf("inserted %d peeks, selected %d", len(peekIDs), len(inboundPeeks)) t.Fatalf("inserted %d peeks, selected %d", len(peekIDs), len(inboundPeeks))
} }
for i := range inboundPeeks { gotPeekIDs := make([]string, 0, len(inboundPeeks))
if inboundPeeks[i].PeekID != peekIDs[i] { for _, p := range inboundPeeks {
t.Fatalf("") gotPeekIDs = append(gotPeekIDs, p.PeekID)
}
} }
assert.ElementsMatch(t, gotPeekIDs, peekIDs)
// And delete them again // And delete them again
if err = tab.DeleteInboundPeeks(ctx, nil, room.ID); err != nil { if err = tab.DeleteInboundPeeks(ctx, nil, room.ID); err != nil {

9
federationapi/storage/tables/outbound_peeks_table_test.go
View file

@ -13,6 +13,7 @@ import (
"github.com/matrix-org/dendrite/test" "github.com/matrix-org/dendrite/test"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/util" "github.com/matrix-org/util"
"github.com/stretchr/testify/assert"
) )
func mustCreateOutboundpeeksTable(t *testing.T, dbType test.DBType) (tables.FederationOutboundPeeks, func()) { func mustCreateOutboundpeeksTable(t *testing.T, dbType test.DBType) (tables.FederationOutboundPeeks, func()) {
@ -124,11 +125,11 @@ func TestOutboundPeeksTable(t *testing.T) {
if len(outboundPeeks) != len(peekIDs) { if len(outboundPeeks) != len(peekIDs) {
t.Fatalf("inserted %d peeks, selected %d", len(peekIDs), len(outboundPeeks)) t.Fatalf("inserted %d peeks, selected %d", len(peekIDs), len(outboundPeeks))
} }
for i := range outboundPeeks { gotPeekIDs := make([]string, 0, len(outboundPeeks))
if outboundPeeks[i].PeekID != peekIDs[i] { for _, p := range outboundPeeks {
t.Fatalf("") gotPeekIDs = append(gotPeekIDs, p.PeekID)
}
} }
assert.ElementsMatch(t, gotPeekIDs, peekIDs)
// And delete them again // And delete them again
if err = tab.DeleteOutboundPeeks(ctx, nil, room.ID); err != nil { if err = tab.DeleteOutboundPeeks(ctx, nil, room.ID); err != nil {