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

Jump to bottom

Tests for eager-sync behaviour during and after a partial join #588

Merged
merged 20 commits into from
Jan 23, 2023
Merged

Tests for eager-sync behaviour during and after a partial join #588

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
84dc8b9
Change tests to accomodate non blocking regular sync
Jan 16, 2023
0b9cce3
Remove or rename mentions of regular sync
Jan 17, 2023
a8dfc9d
Add long polling test
Jan 18, 2023
0af85cf
WIP: test eager syncs during partial joins
Jan 19, 2023
87a2f65
Fixxxxx
Jan 19, 2023
cb46edc
Fix suffix
Jan 19, 2023
05b53bc
Fix
Jan 19, 2023
84c8878
Maybe use `MustSyncUntil`?
Jan 19, 2023
a078542
Wait for resync
Jan 19, 2023
5d0b5fd
Revert "Maybe use `MustSyncUntil`?"
Jan 19, 2023
fe2939a
Allow PDUs and EDUs
Jan 19, 2023
ee661be
Improve error message?
Jan 20, 2023
394a9bf
Paranoia comment
Jan 20, 2023
6738a25
Reinstate Mathieu's test
Jan 20, 2023
e51b5c2
Minor comment tweaks
Jan 20, 2023
0beaabf
Fix caching comment
Jan 22, 2023
70f58ac
Merge branch 'main' into dmr/eager-syncs-faster-joins
Jan 23, 2023
76d2e5c
Use MustSyncUntil to avoid a race
Jan 23, 2023
e1d3bbe
Comment
Jan 23, 2023
2fcb98b
Improve long-polling faster join test
Jan 23, 2023
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
14 changes: 11 additions & 3 deletions internal/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,9 @@ func (c *CSAPI) SetPushRule(t *testing.T, scope string, kind string, ruleID stri
return c.MustDoFunc(t, "PUT", []string{"_matrix", "client", "v3", "pushrules", scope, kind, ruleID}, WithJSONBody(t, body), WithQueries(queryParams))
}

// SendEventSynced sends `e` into the room and waits for its event ID to come down /sync.
// SendEventUnsynced sends `e` into the room.
// Returns the event ID of the sent event.
func (c *CSAPI) SendEventSynced(t *testing.T, roomID string, e b.Event) string {
func (c *CSAPI) SendEventUnsynced(t *testing.T, roomID string, e b.Event) string {
t.Helper()
c.txnID++
paths := []string{"_matrix", "client", "v3", "rooms", roomID, "send", e.Type, strconv.Itoa(c.txnID)}
Expand All @@ -272,6 +272,14 @@ func (c *CSAPI) SendEventSynced(t *testing.T, roomID string, e b.Event) string {
res := c.MustDoFunc(t, "PUT", paths, WithJSONBody(t, e.Content))
body := ParseJSON(t, res)
eventID := GetJSONFieldStr(t, body, "event_id")
return eventID
}

// SendEventSynced sends `e` into the room and waits for its event ID to come down /sync.
// Returns the event ID of the sent event.
func (c *CSAPI) SendEventSynced(t *testing.T, roomID string, e b.Event) string {
t.Helper()
eventID := c.SendEventUnsynced(t, roomID, e)
t.Logf("SendEventSynced waiting for event ID %s", eventID)
c.MustSyncUntil(t, SyncReq{}, SyncTimelineHas(roomID, func(r gjson.Result) bool {
return r.Get("event_id").Str == eventID
Expand Down Expand Up @@ -414,7 +422,7 @@ func (c *CSAPI) LoginUser(t *testing.T, localpart, password string) (userID, acc
"user": localpart,
},
"password": password,
"type": "m.login.password",
"type": "m.login.password",
}
res := c.MustDoFunc(t, "POST", []string{"_matrix", "client", "v3", "login"}, WithJSONBody(t, reqBody))

Expand Down
Loading