Switch to fire and forget sending over historical events which we don't expect to sync

Author: MadLittleMods

internal/client/client.go

@@ -84,9 +84,7 @@ func (c *CSAPI) JoinRoom(t *testing.T, roomIDOrAlias string, serverNames []strin
 	return GetJSONFieldStr(t, body, "room_id")
 }
 
-// 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 {
+func (c *CSAPI) SendEvent(t *testing.T, roomID string, e b.Event) string {
 	t.Helper()
 	c.txnID++
 	paths := []string{"_matrix", "client", "r0", "rooms", roomID, "send", e.Type, strconv.Itoa(c.txnID)}
@@ -107,6 +105,15 @@ func (c *CSAPI) SendEventSynced(t *testing.T, roomID string, e b.Event) string {
 	res := c.MustDoRaw(t, "PUT", paths, b, "application/json", query)
 	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.SendEvent(t, roomID, e)
 	t.Logf("SendEventSynced waiting for event ID %s", eventID)
 	c.SyncUntilTimelineHas(t, roomID, func(r gjson.Result) bool {
 		return r.Get("event_id").Str == eventID

tests/msc2716_test.go

@@ -7,10 +7,12 @@
 package tests
 
 import (
+	"net/url"
 	"testing"
 
 	"github.com/matrix-org/complement/internal/b"
 	"github.com/matrix-org/complement/internal/must"
+	"github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 )
 
@@ -49,7 +51,7 @@ func TestBackfillingHistory(t *testing.T) {
 	})
 
 	// event1
-	alice.SendEventSynced(t, roomID, b.Event{
+	event1 := alice.SendEvent(t, roomID, b.Event{
 		Type: "m.room.message",
 		PrevEvents: []string{
 			eventA,
@@ -60,11 +62,47 @@ func TestBackfillingHistory(t *testing.T) {
 		},
 	})
 
+	// event2
+	event2 := alice.SendEvent(t, roomID, b.Event{
+		Type: "m.room.message",
+		PrevEvents: []string{
+			event1,
+		},
+		Content: map[string]interface{}{
+			"msgtype": "m.text",
+			"body":    "Message 2",
+		},
+	})
+
+	// event3
+	alice.SendEvent(t, roomID, b.Event{
+		Type: "m.room.message",
+		PrevEvents: []string{
+			event2,
+		},
+		Content: map[string]interface{}{
+			"msgtype": "m.text",
+			"body":    "Message 3",
+		},
+	})
+
+	res := alice.MustDoRaw(t, "GET", []string{"_matrix", "client", "r0", "rooms", roomID, "messages"}, nil, "application/json", url.Values{
+		"dir":   []string{"b"},
+		"limit": []string{"100"},
+	})
+
+	t.Logf("aweawfeefwaweafeafw")
+	logrus.WithFields(logrus.Fields{
+		"res": res,
+	}).Error("messages res")
+
 	t.Run("parallel", func(t *testing.T) {
 		// sytest: Room creation reports m.room.create to myself
 		t.Run("Room creation reports m.room.create to myself", func(t *testing.T) {
 			t.Parallel()
+
 			alice := deployment.Client(t, "hs1", userID)
+
 			alice.SyncUntilTimelineHas(t, roomID, func(ev gjson.Result) bool {
 				if ev.Get("type").Str != "m.room.create" {
 					return false