Skip to content

Remove Dendrite skips from room upgrade push rule tests #822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Remove Dendrite skips from room upgrade push rule tests #822

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions tests/csapi/room_upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ func TestPushRuleRoomUpgrade(t *testing.T) {
t.Run(upgradeDescriptorPrefix+"upgrading a room carries over existing push rules for local users", func(t *testing.T) {
t.Parallel()

Copy link
Collaborator Author

@MadLittleMods MadLittleMods Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI is using https://codeload.github.com/element-hq/dendrite/tar.gz/12b7038989b9e3f6a7bbbd962196e2dd36ec13f0 corresponding to the commit that includes the fix in Dendrite (element-hq/dendrite@12b7038).

But the tests are still failing for the same reason:

❌ TestPushRuleRoomUpgrade/parallel/upgrading_a_room_carries_over_existing_push_rules_for_local_users (6.39s)
      room_upgrade_test.go:89: Checking push rules (before upgrade) for @user-128-alice:hs1
      room_upgrade_test.go:89: Checking push rules (before upgrade) for @user-129-alice2:hs1
      room_upgrade_test.go:125: Upgraded room !elCWMwXxgKzi5gqO:hs1 to !GxZSg7a8AVeZ29Ie:hs1
      room_upgrade_test.go:141: Checking push rules (after upgrade) for @user-128-alice:hs1
      room_upgrade_test.go:143: @user-128-alice:hs1 MustSyncUntil: timed out after 5.04126244s. Seen 6 /sync responses. Checkers:
          [t=32.802391ms] Response #1: Key account_data.events does not exist
          [t=1.034544608s] Response #2: Key account_data.events does not exist
          [t=2.036325764s] Response #3: Key account_data.events does not exist
          [t=3.03838327s] Response #4: Key account_data.events does not exist
          [t=4.039937578s] Response #5: Key account_data.events does not exist
          [t=5.04125746s] Response #6: Key account_data.events does not exist, 
          [t=32.826866ms] Response #1: Key account_data.events does not exist
          [t=1.034548655s] Response #2: Key account_data.events does not exist
          [t=2.036330223s] Response #3: Key account_data.events does not exist
          [t=3.038387698s] Response #4: Key account_data.events does not exist
          [t=4.039940784s] Response #5: Key account_data.events does not exist
          [t=5.041261107s] Response #6: Key account_data.events does not exist,

Copy link
Collaborator Author

@MadLittleMods MadLittleMods Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @S7evinK although no pressure for further development

// FIXME: We have to skip this test on Dendrite because it doesn't seem to send
// the new push rules down sync in many scenarios.
runtime.SkipIf(t, runtime.Dendrite)

// FIXME: We have to skip this test on Synapse until
// https://github.com/element-hq/synapse/issues/19199 is resolved.
if useManualRoomUpgrade {
Expand Down Expand Up @@ -173,10 +169,6 @@ func TestPushRuleRoomUpgrade(t *testing.T) {
t.Run("joining a remote "+upgradeDescriptorPrefix+"upgraded room carries over existing push rules", func(t *testing.T) {
t.Parallel()

// FIXME: We have to skip this test on Dendrite because it doesn't seem to send
// the new push rules down sync in many scenarios.
runtime.SkipIf(t, runtime.Dendrite)

// Start a sync loop
_, bobSince := bob.MustSync(t, client.SyncReq{TimeoutMillis: "0"})
_, bob2Since := bob2.MustSync(t, client.SyncReq{TimeoutMillis: "0"})
Expand Down
Loading