From c95348ca0d7a90eb1f7df36167c64d9473e913fc Mon Sep 17 00:00:00 2001 From: Andrew Ferrazzutti Date: Mon, 23 Feb 2026 22:08:52 -0500 Subject: [PATCH] MSC4140: drop delayed state interference tests Don't test that a user's delayed state events are cancelled by a more recent state event from a different user. That behaviour has been delegated to an "alternative" in the delayed event MSC for some time now, and may be removed from Synapse. --- tests/msc4140/delayed_event_test.go | 79 ----------------------------- 1 file changed, 79 deletions(-) diff --git a/tests/msc4140/delayed_event_test.go b/tests/msc4140/delayed_event_test.go index 3e59cf20..4384411b 100644 --- a/tests/msc4140/delayed_event_test.go +++ b/tests/msc4140/delayed_event_test.go @@ -360,85 +360,6 @@ func TestDelayedEvents(t *testing.T) { }) }) - t.Run("delayed state is not cancelled by new state from the same user", func(t *testing.T) { - var res *http.Response - - stateKey := "to_not_be_cancelled_by_same_user" - - defer cleanupDelayedEvents(t, user) - - setterKey := "setter" - setterExpected := "on_timeout" - user.MustDo( - t, - "PUT", - getPathForState(roomID, eventType, stateKey), - client.WithJSONBody(t, map[string]interface{}{ - setterKey: setterExpected, - }), - getDelayQueryParam("900"), - ) - matchDelayedEvents(t, user, delayedEventsNumberEqual(1)) - - user.MustDo( - t, - "PUT", - getPathForState(roomID, eventType, stateKey), - client.WithJSONBody(t, map[string]interface{}{ - setterKey: "manual", - }), - ) - matchDelayedEvents(t, user, delayedEventsNumberEqual(1)) - - time.Sleep(1 * time.Second) - res = user.MustDo(t, "GET", getPathForState(roomID, eventType, stateKey)) - must.MatchResponse(t, res, match.HTTPResponse{ - JSON: []match.JSON{ - match.JSONKeyEqual(setterKey, setterExpected), - }, - }) - }) - - t.Run("delayed state is cancelled by new state from another user", func(t *testing.T) { - var res *http.Response - - stateKey := "to_be_cancelled_by_other_user" - - defer cleanupDelayedEvents(t, user) - defer cleanupDelayedEvents(t, user2) - - setterKey := "setter" - user.MustDo( - t, - "PUT", - getPathForState(roomID, eventType, stateKey), - client.WithJSONBody(t, map[string]interface{}{ - setterKey: "on_timeout", - }), - getDelayQueryParam("900"), - ) - matchDelayedEvents(t, user, delayedEventsNumberEqual(1)) - - setterExpected := "manual" - user2.MustDo( - t, - "PUT", - getPathForState(roomID, eventType, stateKey), - client.WithJSONBody(t, map[string]interface{}{ - setterKey: setterExpected, - }), - ) - matchDelayedEvents(t, user, delayedEventsNumberEqual(0)) - - time.Sleep(1 * time.Second) - res = user.MustDo(t, "GET", getPathForState(roomID, eventType, stateKey)) - must.MatchResponse(t, res, match.HTTPResponse{ - JSON: []match.JSON{ - match.JSONKeyEqual(setterKey, setterExpected), - }, - }) - }) - t.Run("delayed state events are kept on server restart", func(t *testing.T) { // Spec cannot enforce server restart behaviour runtime.SkipIf(t, runtime.Dendrite, runtime.Conduit, runtime.Conduwuit)