Add more tests for receiving events while resyncing for a partial join #419
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -143,66 +143,8 @@ func TestPartialStateJoin(t *testing.T) { | |
|
|
||
| // derek sends an event in the room | ||
| event := psjResult.CreateMessageEvent(t, "derek", nil) | ||
| t.Logf("Derek sent event event ID %s", event.EventID()) | ||
| testReceiveEventDuringPartialStateJoin(t, deployment, alice, psjResult, event) | ||
| }) | ||
|
|
||
| // a request to (client-side) /members?at= should block until the (federation) /state request completes | ||
|
|
@@ -505,6 +447,74 @@ func TestPartialStateJoin(t *testing.T) { | |
| }) | ||
| } | ||
|
|
||
| // test reception of an event over federation during a resync | ||
| // sends the given event to the homeserver under test, checks that a client can see it and checks | ||
| // the state at the event | ||
| func testReceiveEventDuringPartialStateJoin( | ||
| t *testing.T, deployment *docker.Deployment, alice *client.CSAPI, psjResult partialStateJoinResult, event *gomatrixserverlib.Event, | ||
| ) { | ||
| // send the event to the homeserver | ||
| psjResult.Server.MustSendTransaction(t, deployment, "hs1", []json.RawMessage{event.JSON()}, nil) | ||
|
|
||
| /* TODO: check that a lazy-loading sync can see the event. Currently this doesn't work, because /sync blocks. | ||
| * https://github.com/matrix-org/synapse/issues/13146 | ||
| alice.MustSyncUntil(t, | ||
| client.SyncReq{ | ||
| Filter: buildLazyLoadingSyncFilter(nil), | ||
| }, | ||
| client.SyncTimelineHasEventID(psjResult.ServerRoom.RoomID, event.EventID()), | ||
| ) | ||
| */ | ||
|
|
||
| // still, Alice should be able to see the event with an /event request. We might have to try it a few times. | ||
| start := time.Now() | ||
| for { | ||
| if time.Since(start) > time.Second { | ||
| t.Fatalf("timeout waiting for received event to be visible") | ||
| } | ||
| res := alice.DoFunc(t, "GET", []string{"_matrix", "client", "r0", "rooms", psjResult.ServerRoom.RoomID, "event", event.EventID()}) | ||
|
There was a problem hiding this comment. You can now use WithRetryUntil in your res := alice.DoFunc(t, "GET", []string{"_matrix", "client", "r0", "rooms", psjResult.ServerRoom.RoomID, "event", event.EventID()},
client.WithRetryUntil(time.Second, func(res *http.Response) bool {
if res.StatusCode == 200 {
return true
}
eventResBody := client.ParseJSON(t, res)
if res.StatusCode == 404 && gjson.GetBytes(eventResBody, "errcode").String() == "M_NOT_FOUND" {
return false
}
t.Fatalf("GET /event failed with %d: %s", res.StatusCode, string(eventResBody))
return false
}) |
||
| eventResBody := client.ParseJSON(t, res) | ||
| if res.StatusCode == 200 { | ||
| t.Logf("Successfully fetched received event %s", event.EventID()) | ||
| break | ||
| } | ||
| if res.StatusCode == 404 && gjson.GetBytes(eventResBody, "errcode").String() == "M_NOT_FOUND" { | ||
| t.Logf("Fetching received event failed with M_NOT_FOUND; will retry") | ||
| time.Sleep(100 * time.Millisecond) | ||
| continue | ||
| } | ||
| t.Fatalf("GET /event failed with %d: %s", res.StatusCode, string(eventResBody)) | ||
| } | ||
|
|
||
| // allow the partial join to complete | ||
| psjResult.FinishStateRequest() | ||
| alice.MustSyncUntil(t, | ||
| client.SyncReq{}, | ||
| client.SyncJoinedTo(alice.UserID, psjResult.ServerRoom.RoomID), | ||
| ) | ||
|
|
||
| // check the server's idea of the state at the event. We do this by making a `state_ids` request over federation | ||
| stateReq := gomatrixserverlib.NewFederationRequest("GET", "hs1", | ||
| fmt.Sprintf("/_matrix/federation/v1/state_ids/%s?event_id=%s", | ||
| url.PathEscape(psjResult.ServerRoom.RoomID), | ||
| url.QueryEscape(event.EventID()), | ||
| ), | ||
| ) | ||
| var respStateIDs gomatrixserverlib.RespStateIDs | ||
| if err := psjResult.Server.SendFederationRequest(deployment, stateReq, &respStateIDs); err != nil { | ||
| t.Errorf("/state_ids request returned non-200: %s", err) | ||
| return | ||
| } | ||
| var gotState, expectedState []interface{} | ||
| for _, ev := range respStateIDs.StateEventIDs { | ||
| gotState = append(gotState, ev) | ||
| } | ||
| for _, ev := range psjResult.ServerRoom.AllCurrentState() { | ||
| expectedState = append(expectedState, ev.EventID()) | ||
| } | ||
| must.CheckOffAll(t, gotState, expectedState) | ||
| } | ||
|
|
||
| // buildLazyLoadingSyncFilter constructs a json-marshalled filter suitable the 'Filter' field of a client.SyncReq | ||
| func buildLazyLoadingSyncFilter(timelineOptions map[string]interface{}) string { | ||
| timelineFilter := map[string]interface{}{ | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
s/sent/created/ here