Skip to content

Commit 35b1745

Browse files
authored
MSC4140: drop delayed state interference tests (#845)
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"] (matrix-org/matrix-spec-proposals@3efecea) in the delayed event MSC4140 for some time now, and may be removed from Synapse ([Synapse PR](element-hq/synapse#19495))
1 parent a1ff978 commit 35b1745

File tree

1 file changed

+0
-79
lines changed

1 file changed

+0
-79
lines changed

tests/msc4140/delayed_event_test.go

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -360,85 +360,6 @@ func TestDelayedEvents(t *testing.T) {
360360
})
361361
})
362362

363-
t.Run("delayed state is not cancelled by new state from the same user", func(t *testing.T) {
364-
var res *http.Response
365-
366-
stateKey := "to_not_be_cancelled_by_same_user"
367-
368-
defer cleanupDelayedEvents(t, user)
369-
370-
setterKey := "setter"
371-
setterExpected := "on_timeout"
372-
user.MustDo(
373-
t,
374-
"PUT",
375-
getPathForState(roomID, eventType, stateKey),
376-
client.WithJSONBody(t, map[string]interface{}{
377-
setterKey: setterExpected,
378-
}),
379-
getDelayQueryParam("900"),
380-
)
381-
matchDelayedEvents(t, user, delayedEventsNumberEqual(1))
382-
383-
user.MustDo(
384-
t,
385-
"PUT",
386-
getPathForState(roomID, eventType, stateKey),
387-
client.WithJSONBody(t, map[string]interface{}{
388-
setterKey: "manual",
389-
}),
390-
)
391-
matchDelayedEvents(t, user, delayedEventsNumberEqual(1))
392-
393-
time.Sleep(1 * time.Second)
394-
res = user.MustDo(t, "GET", getPathForState(roomID, eventType, stateKey))
395-
must.MatchResponse(t, res, match.HTTPResponse{
396-
JSON: []match.JSON{
397-
match.JSONKeyEqual(setterKey, setterExpected),
398-
},
399-
})
400-
})
401-
402-
t.Run("delayed state is cancelled by new state from another user", func(t *testing.T) {
403-
var res *http.Response
404-
405-
stateKey := "to_be_cancelled_by_other_user"
406-
407-
defer cleanupDelayedEvents(t, user)
408-
defer cleanupDelayedEvents(t, user2)
409-
410-
setterKey := "setter"
411-
user.MustDo(
412-
t,
413-
"PUT",
414-
getPathForState(roomID, eventType, stateKey),
415-
client.WithJSONBody(t, map[string]interface{}{
416-
setterKey: "on_timeout",
417-
}),
418-
getDelayQueryParam("900"),
419-
)
420-
matchDelayedEvents(t, user, delayedEventsNumberEqual(1))
421-
422-
setterExpected := "manual"
423-
user2.MustDo(
424-
t,
425-
"PUT",
426-
getPathForState(roomID, eventType, stateKey),
427-
client.WithJSONBody(t, map[string]interface{}{
428-
setterKey: setterExpected,
429-
}),
430-
)
431-
matchDelayedEvents(t, user, delayedEventsNumberEqual(0))
432-
433-
time.Sleep(1 * time.Second)
434-
res = user.MustDo(t, "GET", getPathForState(roomID, eventType, stateKey))
435-
must.MatchResponse(t, res, match.HTTPResponse{
436-
JSON: []match.JSON{
437-
match.JSONKeyEqual(setterKey, setterExpected),
438-
},
439-
})
440-
})
441-
442363
t.Run("delayed state events are kept on server restart", func(t *testing.T) {
443364
// Spec cannot enforce server restart behaviour
444365
runtime.SkipIf(t, runtime.Dendrite, runtime.Conduit, runtime.Conduwuit)

0 commit comments

Comments
 (0)