Skip to content
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

Add presence test from people in 2 different rooms in incremental sync #525

Merged
merged 9 commits into from
Oct 27, 2022
Merged

Add presence test from people in 2 different rooms in incremental sync #525

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4aacefb
Add presence test from people in 2 different rooms in incremental sync
MatMaul Oct 20, 2022
8fcaa38
Try Dendrite
Oct 20, 2022
39f729f
Skip Dendrite with FIXME comment
Oct 21, 2022
459130d
Allow presence events to come in different syncs
Oct 21, 2022
f809bae
Update tests/csapi/sync_test.go
Oct 21, 2022
dab94e3
Fix Dendrite run
Oct 21, 2022
66a7092
Merge branch 'main' into mv/presence-test-wip
Oct 27, 2022
b4c7de3
Signpost comments
Oct 27, 2022
f636aeb
Tweak var names; another signpost
Oct 27, 2022
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
44 changes: 44 additions & 0 deletions tests/csapi/sync_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,50 @@ func TestSync(t *testing.T) {
})
}

// Test presence from people in 2 different rooms in incremental sync
func TestPresenceSyncDifferentRooms(t *testing.T) {
runtime.SkipIf(t, runtime.Dendrite) // does not yet pass
MatMaul marked this conversation as resolved.
Show resolved Hide resolved

deployment := Deploy(t, b.BlueprintOneToOneRoom)
defer deployment.Destroy(t)

alice := deployment.Client(t, "hs1", "@alice:hs1")
bob := deployment.Client(t, "hs1", "@bob:hs1")

deployment.RegisterUser(t, "hs1", "charlie", "charlie", false)
MatMaul marked this conversation as resolved.
Show resolved Hide resolved
charlie := deployment.Client(t, "hs1", "@charlie:hs1")

bobRoomID := alice.CreateRoom(t, struct{}{})
DMRobertson marked this conversation as resolved.
Show resolved Hide resolved
charlieRoomID := alice.CreateRoom(t, struct{}{})
nextBatch := alice.MustSyncUntil(t, client.SyncReq{}, client.SyncJoinedTo(alice.UserID, bobRoomID), client.SyncJoinedTo(alice.UserID, charlieRoomID))

alice.InviteRoom(t, bobRoomID, bob.UserID)
alice.InviteRoom(t, charlieRoomID, charlie.UserID)
bob.JoinRoom(t, bobRoomID, nil)
charlie.JoinRoom(t, charlieRoomID, nil)

nextBatch = alice.MustSyncUntil(t,
client.SyncReq{Since: nextBatch},
client.SyncJoinedTo(bob.UserID, bobRoomID),
client.SyncJoinedTo(charlie.UserID, charlieRoomID),
)

reqBody := client.WithJSONBody(t, map[string]interface{}{
DMRobertson marked this conversation as resolved.
Show resolved Hide resolved
"presence": "online",
})
bob.DoFunc(t, "PUT", []string{"_matrix", "client", "v3", "presence", "@bob:hs1", "status"}, reqBody)
charlie.DoFunc(t, "PUT", []string{"_matrix", "client", "v3", "presence", "@charlie:hs1", "status"}, reqBody)

nextBatch = alice.MustSyncUntil(t, client.SyncReq{Since: nextBatch}, func(clientUserID string, sync gjson.Result) error {
presence := sync.Get("presence")
if len(presence.Get("events").Array()) == 0 {
return fmt.Errorf("presence.events is empty: %+v", presence)
}
usersInPresenceEvents(t, presence, []string{bob.UserID, charlie.UserID})
MatMaul marked this conversation as resolved.
Show resolved Hide resolved
return nil
})
}

func sendMessages(t *testing.T, client *client.CSAPI, roomID string, prefix string, count int) {
t.Helper()
for i := 0; i < count; i++ {
Expand Down