From 1f77200299295ebfa86fed491693a174e6b464db Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Tue, 2 Sep 2025 06:28:44 +0000 Subject: [PATCH] Mark MSC4297 compliance as flake. Signed-off-by: Jason Volk --- docker/complement.sh | 3 +++ tests/test_results/complement/test_results.jsonl | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/complement.sh b/docker/complement.sh index f41b932f..c802bce6 100755 --- a/docker/complement.sh +++ b/docker/complement.sh @@ -31,6 +31,9 @@ skip="${skip}|TestRoomCreate/Parallel/POST_/createRoom_makes_a_room_with_a_topic skip="${skip}|TestLogin/parallel/POST_/" skip="${skip}|TestUnbanViaInvite" skip="${skip}|TestRoomState/Parallel/GET_/publicRooms_lists_newly-created_room" +# flakes due to timeout in debug-mode +skip="${skip}|TestMSC4297StateResolutionV2_1_starts_from_empty_set" +skip="${skip}|TestMSC4297StateResolutionV2_1_includes_conflicted_subgraph" set -a cargo_profile="${cargo_profile:-$default_cargo_profile}" diff --git a/tests/test_results/complement/test_results.jsonl b/tests/test_results/complement/test_results.jsonl index 16640c19..2c1a02b3 100644 --- a/tests/test_results/complement/test_results.jsonl +++ b/tests/test_results/complement/test_results.jsonl @@ -328,8 +328,6 @@ {"Action":"pass","Test":"TestMSC4291RoomIDAsHashOfCreateEvent_CannotSendCreateEvent"} {"Action":"pass","Test":"TestMSC4291RoomIDAsHashOfCreateEvent_RoomIDIsOnCreateEvent"} {"Action":"fail","Test":"TestMSC4291RoomIDAsHashOfCreateEvent_UpgradedRooms"} -{"Action":"fail","Test":"TestMSC4297StateResolutionV2_1_includes_conflicted_subgraph"} -{"Action":"fail","Test":"TestMSC4297StateResolutionV2_1_starts_from_empty_set"} {"Action":"fail","Test":"TestMSC4311FullCreateEventOnStrippedState"} {"Action":"pass","Test":"TestMediaConfig"} {"Action":"pass","Test":"TestMediaFilenames"}