From 0580f8272a00d80d2f60fbda84d80761421e89e3 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Fri, 22 Jul 2022 14:20:50 +0100 Subject: [PATCH] Fix the sytest after all (thanks @S7evinK for the spot) --- roomserver/storage/shared/membership_updater.go | 3 +++ sytest-blacklist | 4 ---- sytest-whitelist | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roomserver/storage/shared/membership_updater.go b/roomserver/storage/shared/membership_updater.go index ffcf1f43d..07fb697f9 100644 --- a/roomserver/storage/shared/membership_updater.go +++ b/roomserver/storage/shared/membership_updater.go @@ -91,6 +91,9 @@ func (u *MembershipUpdater) IsKnock() bool { } func (u *MembershipUpdater) Delete() error { + if _, err := u.d.InvitesTable.UpdateInviteRetired(u.ctx, u.txn, u.roomNID, u.targetUserNID); err != nil { + return err + } return u.d.MembershipTable.DeleteMembership(u.ctx, u.txn, u.roomNID, u.targetUserNID) } diff --git a/sytest-blacklist b/sytest-blacklist index b1ac1df73..bcc345f6e 100644 --- a/sytest-blacklist +++ b/sytest-blacklist @@ -49,7 +49,3 @@ Notifications can be viewed with GET /notifications If remote user leaves room we no longer receive device updates Guest users can join guest_access rooms - -# Something is wrong with this test — it passes fine on Complement - -Invited user can reject invite over federation several times diff --git a/sytest-whitelist b/sytest-whitelist index a5cc8bf42..2a145291f 100644 --- a/sytest-whitelist +++ b/sytest-whitelist @@ -413,6 +413,7 @@ Remote users may not join unfederated rooms Non-numeric ports in server names are rejected Invited user can reject invite over federation Invited user can reject invite over federation for empty room +Invited user can reject invite over federation several times Can reject invites over federation for rooms with version 1 Can reject invites over federation for rooms with version 2 Can reject invites over federation for rooms with version 3