Skip to content

Commit b0c66b2

Browse files
ShadowJonathanShadowJonathan
authored
Clean-up SkipIfs in complement. (#519)
* Add issue numbers for why the test is skipped. * Stop skipping tests that actually pass.
1 parent 73415ae commit b0c66b2

11 files changed

+19
-24
lines changed

‎tests/csapi/apidoc_room_state_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package csapi_tests
22

33
import (
4+
"net/http"
45
"net/url"
56
"testing"
67
"time"
@@ -11,9 +12,6 @@ import (
1112
"github.com/matrix-org/complement/internal/client"
1213
"github.com/matrix-org/complement/internal/match"
1314
"github.com/matrix-org/complement/internal/must"
14-
"github.com/matrix-org/complement/runtime"
15-
16-
"net/http"
1715
)
1816

1917
func TestRoomState(t *testing.T) {
@@ -330,7 +328,6 @@ func TestRoomState(t *testing.T) {
330328
})
331329
})
332330
t.Run("GET /rooms/:room_id/joined_members is forbidden after leaving room", func(t *testing.T) {
333-
runtime.SkipIf(t, runtime.Dendrite) // https://github.com/matrix-org/complement/pull/424
334331
t.Parallel()
335332
roomID := authedClient.CreateRoom(t, map[string]interface{}{})
336333
authedClient.LeaveRoom(t, roomID)

‎tests/csapi/device_lists_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ func TestDeviceListUpdates(t *testing.T) {
328328
t.Run("when remote user leaves a room", func(t *testing.T) { testOtherUserLeave(t, deployment, "hs1", "hs2") })
329329
t.Run("when leaving a room with a local user", func(t *testing.T) { testLeave(t, deployment, "hs1", "hs1") })
330330
t.Run("when leaving a room with a remote user", func(t *testing.T) {
331-
runtime.SkipIf(t, runtime.Synapse) // https://github.com/matrix-org/synapse/issues/13650
331+
runtime.SkipIf(t, runtime.Synapse) // FIXME: https://github.com/matrix-org/synapse/issues/13650
332332
testLeave(t, deployment, "hs1", "hs2")
333333
})
334334
t.Run("when local user rejoins a room", func(t *testing.T) { testOtherUserRejoin(t, deployment, "hs1", "hs1") })

‎tests/csapi/invalid_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ func getFilters() []map[string]interface{} {
168168

169169
// sytest: Check creating invalid filters returns 4xx
170170
func TestFilter(t *testing.T) {
171-
runtime.SkipIf(t, runtime.Dendrite) // TODO remove if https://github.com/matrix-org/dendrite/issues/2067 is fixed
171+
runtime.SkipIf(t, runtime.Dendrite) // FIXME: https://github.com/matrix-org/dendrite/issues/2067
172172

173173
deployment := Deploy(t, b.BlueprintAlice)
174174
defer deployment.Destroy(t)

‎tests/csapi/push_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,10 @@ import (
1111
"github.com/matrix-org/complement/internal/client"
1212
"github.com/matrix-org/complement/internal/match"
1313
"github.com/matrix-org/complement/internal/must"
14-
"github.com/matrix-org/complement/runtime"
1514
)
1615

17-
// @shadowjonathan: do we need this test anymore?
1816
// sytest: Getting push rules doesn't corrupt the cache SYN-390
1917
func TestPushRuleCacheHealth(t *testing.T) {
20-
runtime.SkipIf(t, runtime.Dendrite) // Dendrite does not support push notifications (yet)
21-
2218
deployment := Deploy(t, b.BlueprintAlice)
2319
defer deployment.Destroy(t)
2420

‎tests/csapi/room_relations_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@ import (
1212
"github.com/matrix-org/complement/internal/client"
1313
"github.com/matrix-org/complement/internal/match"
1414
"github.com/matrix-org/complement/internal/must"
15-
"github.com/matrix-org/complement/runtime"
1615
)
1716

1817
func TestRelations(t *testing.T) {
19-
runtime.SkipIf(t, runtime.Dendrite) // not supported
2018
deployment := Deploy(t, b.BlueprintAlice)
2119
defer deployment.Destroy(t)
2220

@@ -112,7 +110,6 @@ func TestRelations(t *testing.T) {
112110
}
113111

114112
func TestRelationsPagination(t *testing.T) {
115-
runtime.SkipIf(t, runtime.Dendrite) // not supported
116113
deployment := Deploy(t, b.BlueprintAlice)
117114
defer deployment.Destroy(t)
118115

‎tests/csapi/rooms_members_local_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestMembersLocal(t *testing.T) {
3636

3737
// sytest: Existing members see new members' presence
3838
t.Run("Existing members see new members' presence", func(t *testing.T) {
39-
runtime.SkipIf(t, runtime.Dendrite) // Still failing
39+
runtime.SkipIf(t, runtime.Dendrite) // FIXME: https://github.com/matrix-org/dendrite/issues/2803
4040
t.Parallel()
4141
alice.MustSyncUntil(t, client.SyncReq{},
4242
client.SyncJoinedTo(bob.UserID, roomID),

‎tests/csapi/sync_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func TestTentativeEventualJoiningAfterRejecting(t *testing.T) {
102102
}
103103

104104
func TestSync(t *testing.T) {
105-
runtime.SkipIf(t, runtime.Dendrite) // too flakey, fails with sync_test.go:135: unchanged room !7ciB69Jg2lCc4Vdf:hs1 should not be in the sync
105+
runtime.SkipIf(t, runtime.Dendrite) // FIXME: https://github.com/matrix-org/dendrite/issues/1324
106106
// sytest: Can sync
107107
deployment := Deploy(t, b.BlueprintOneToOneRoom)
108108
defer deployment.Destroy(t)
@@ -162,7 +162,7 @@ func TestSync(t *testing.T) {
162162
})
163163
// sytest: Newly joined room has correct timeline in incremental sync
164164
t.Run("Newly joined room has correct timeline in incremental sync", func(t *testing.T) {
165-
runtime.SkipIf(t, runtime.Dendrite) // does not yet pass
165+
runtime.SkipIf(t, runtime.Dendrite) // FIXME: https://github.com/matrix-org/dendrite/issues/1324
166166
t.Parallel()
167167
filter = map[string]interface{}{
168168
"room": map[string]interface{}{
@@ -211,7 +211,7 @@ func TestSync(t *testing.T) {
211211
})
212212
// sytest: Newly joined room includes presence in incremental sync
213213
t.Run("Newly joined room includes presence in incremental sync", func(t *testing.T) {
214-
runtime.SkipIf(t, runtime.Dendrite) // does not yet pass
214+
runtime.SkipIf(t, runtime.Dendrite) // FIXME: https://github.com/matrix-org/dendrite/issues/1324
215215
roomID := alice.CreateRoom(t, map[string]interface{}{"preset": "public_chat"})
216216
alice.MustSyncUntil(t, client.SyncReq{}, client.SyncJoinedTo(alice.UserID, roomID))
217217
_, nextBatch := bob.MustSync(t, client.SyncReq{})
@@ -231,7 +231,7 @@ func TestSync(t *testing.T) {
231231
})
232232
// sytest: Get presence for newly joined members in incremental sync
233233
t.Run("Get presence for newly joined members in incremental sync", func(t *testing.T) {
234-
runtime.SkipIf(t, runtime.Dendrite) // does not yet pass
234+
runtime.SkipIf(t, runtime.Dendrite) // FIXME: https://github.com/matrix-org/dendrite/issues/1324
235235
roomID := alice.CreateRoom(t, map[string]interface{}{"preset": "public_chat"})
236236
nextBatch := alice.MustSyncUntil(t, client.SyncReq{}, client.SyncJoinedTo(alice.UserID, roomID))
237237
sendMessages(t, alice, roomID, "dummy message", 1)

‎tests/csapi/upload_keys_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func TestUploadKey(t *testing.T) {
5454

5555
// sytest: Rejects invalid device keys
5656
t.Run("Rejects invalid device keys", func(t *testing.T) {
57-
runtime.SkipIf(t, runtime.Dendrite, runtime.Synapse) // Dendrite doesn't pass, Synapse has it blacklisted
57+
runtime.SkipIf(t, runtime.Dendrite, runtime.Synapse) // Blacklisted on Synapse, Dendrite FIXME: https://github.com/matrix-org/dendrite/issues/2804
5858
t.Parallel()
5959
// algorithms, keys and signatures are required fields, but missing
6060
reqBody := client.WithJSONBody(t, map[string]interface{}{

‎tests/federation_room_ban_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
// Create a federation room. Bob bans Alice. Bob unbans Alice. Bob invites Alice (unbanning her). Ensure the invite is
1313
// received and can be accepted.
1414
func TestUnbanViaInvite(t *testing.T) {
15-
runtime.SkipIf(t, runtime.Synapse) // https://github.com/matrix-org/synapse/issues/1563
15+
runtime.SkipIf(t, runtime.Synapse) // FIXME: https://github.com/matrix-org/synapse/issues/1563
1616
deployment := Deploy(t, b.BlueprintFederationOneToOneRoom)
1717
defer deployment.Destroy(t)
1818

‎tests/federation_room_join_test.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,10 @@ func TestJoinFederatedRoomWithUnverifiableEvents(t *testing.T) {
200200
alice.JoinRoom(t, roomAlias, nil)
201201
})
202202
t.Run("/send_join response with state with unverifiable auth events shouldn't block room join", func(t *testing.T) {
203-
runtime.SkipIf(t, runtime.Dendrite) // https://github.com/matrix-org/dendrite/issues/2028
203+
// FIXME: https://github.com/matrix-org/dendrite/issues/2800
204+
// (previously https://github.com/matrix-org/dendrite/issues/2028)
205+
runtime.SkipIf(t, runtime.Dendrite)
206+
204207
room := srv.MustMakeRoom(t, ver, federation.InitialRoomEvents(ver, charlie))
205208
roomAlias := srv.MakeAliasMapping("UnverifiableAuthEvents", room.RoomID)
206209

@@ -528,7 +531,9 @@ func typeAndStateKeyForEvent(result gjson.Result) string {
528531
}
529532

530533
func TestJoinFederatedRoomFromApplicationServiceBridgeUser(t *testing.T) {
531-
runtime.SkipIf(t, runtime.Dendrite) // Dendrite doesn't read AS registration files from Complement yet
534+
// Dendrite doesn't read AS registration files from Complement yet
535+
runtime.SkipIf(t, runtime.Dendrite) // FIXME: https://github.com/matrix-org/complement/issues/514
536+
532537
deployment := Deploy(t, b.BlueprintHSWithApplicationService)
533538
defer deployment.Destroy(t)
534539

0 commit comments

Comments
 (0)