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

Unbreak tests

Browse source
This commit is contained in:
Kegan Dougal 2022-05-16 17:25:38 +01:00
parent 8a95edad75
commit b75fc332dd
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
test/room.go
View file

@ -102,21 +102,17 @@ func (r *Room) insertCreateEvents(t *testing.T) {
joinRule.JoinRule = "public" joinRule.JoinRule = "public"
hisVis.HistoryVisibility = "shared" hisVis.HistoryVisibility = "shared"
} }
var mods []eventModifier
if r.creator.keyID != "" && r.creator.privKey != nil {
mods = append(mods, WithKeyID(r.creator.keyID), WithPrivateKey(r.creator.privKey), WithOrigin(r.creator.srvName))
}
r.CreateAndInsert(t, r.creator, gomatrixserverlib.MRoomCreate, map[string]interface{}{ r.CreateAndInsert(t, r.creator, gomatrixserverlib.MRoomCreate, map[string]interface{}{
"creator": r.creator.ID, "creator": r.creator.ID,
"room_version": r.Version, "room_version": r.Version,
}, append(mods, WithStateKey(""))...) }, WithStateKey(""))
r.CreateAndInsert(t, r.creator, gomatrixserverlib.MRoomMember, map[string]interface{}{ r.CreateAndInsert(t, r.creator, gomatrixserverlib.MRoomMember, map[string]interface{}{
"membership": "join", "membership": "join",
}, append(mods, WithStateKey(r.creator.ID))...) }, WithStateKey(r.creator.ID))
r.CreateAndInsert(t, r.creator, gomatrixserverlib.MRoomPowerLevels, plContent, append(mods, WithStateKey(""))...) r.CreateAndInsert(t, r.creator, gomatrixserverlib.MRoomPowerLevels, plContent, WithStateKey(""))
r.CreateAndInsert(t, r.creator, gomatrixserverlib.MRoomJoinRules, joinRule, append(mods, WithStateKey(""))...) r.CreateAndInsert(t, r.creator, gomatrixserverlib.MRoomJoinRules, joinRule, WithStateKey(""))
r.CreateAndInsert(t, r.creator, gomatrixserverlib.MRoomHistoryVisibility, hisVis, append(mods, WithStateKey(""))...) r.CreateAndInsert(t, r.creator, gomatrixserverlib.MRoomHistoryVisibility, hisVis, WithStateKey(""))
} }
// Create an event in this room but do not insert it. Does not modify the room in any way (depth, fwd extremities, etc) so is thread-safe. // Create an event in this room but do not insert it. Does not modify the room in any way (depth, fwd extremities, etc) so is thread-safe.
@ -131,16 +127,16 @@ func (r *Room) CreateEvent(t *testing.T, creator *User, eventType string, conten
} }
if mod.privKey == nil { if mod.privKey == nil {
t.Fatalf("CreateEvent[%s]: missing private key", eventType) mod.privKey = creator.privKey
} }
if mod.keyID == "" { if mod.keyID == "" {
t.Fatalf("CreateEvent[%s]: missing key ID", eventType) mod.keyID = creator.keyID
} }
if mod.originServerTS.IsZero() { if mod.originServerTS.IsZero() {
mod.originServerTS = time.Now() mod.originServerTS = time.Now()
} }
if mod.origin == "" { if mod.origin == "" {
t.Fatalf("CreateEvent[%s]: missing origin", eventType) mod.origin = creator.srvName
} }
var unsigned gomatrixserverlib.RawJSON var unsigned gomatrixserverlib.RawJSON