Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ func (c *CSAPI) UpgradeRoom(t ct.TestLike, roomID string, newVersion string) *ht
//
// Args:
// - `serverNames`: The list of servers to attempt to join the room through.
// These should be a resolvable addresses within the deployment network.
// These should be a resolvable address within the deployment network.
func (c *CSAPI) MustJoinRoom(t ct.TestLike, roomIDOrAlias string, serverNames []spec.ServerName) string {
t.Helper()
res := c.JoinRoom(t, roomIDOrAlias, serverNames)
Expand All @@ -221,7 +221,7 @@ func (c *CSAPI) MustJoinRoom(t ct.TestLike, roomIDOrAlias string, serverNames []
//
// Args:
// - `serverNames`: The list of servers to attempt to join the room through.
// These should be a resolvable addresses within the deployment network.
// These should be a resolvable address within the deployment network.
func (c *CSAPI) JoinRoom(t ct.TestLike, roomIDOrAlias string, serverNames []spec.ServerName) *http.Response {
t.Helper()
// construct URL query parameters
Expand Down
6 changes: 3 additions & 3 deletions federation/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ func (s *Server) FederationClient(deployment FederationDeployment) fclient.Feder
// for any sent PDUs. Times out after 10 seconds.
//
// Args:
// - `destination`: This should be a resolvable addresses within the deployment network.
// - `destination`: This should be a resolvable address within the deployment network.
func (s *Server) MustSendTransaction(t ct.TestLike, deployment FederationDeployment, destination spec.ServerName, pdus []json.RawMessage, edus []gomatrixserverlib.EDU) {
t.Helper()
fedClient := s.FederationClient(deployment)
Expand Down Expand Up @@ -361,7 +361,7 @@ func (s *Server) MustCreateEvent(t ct.TestLike, room *ServerRoom, ev Event) goma
// It returns the resultant room.
//
// Args:
// - `remoteServer`: This should be a resolvable addresses within the deployment network.
// - `remoteServer`: This should be a resolvable address within the deployment network.
func (s *Server) MustJoinRoom(t ct.TestLike, deployment FederationDeployment, remoteServer spec.ServerName, roomID string, userID string, opts ...JoinRoomOpt) *ServerRoom {
t.Helper()
var jr joinRoom
Expand Down Expand Up @@ -446,7 +446,7 @@ func (s *Server) MustJoinRoom(t ct.TestLike, deployment FederationDeployment, re
// Leaves a room. If this is rejecting an invite then a make_leave request is made first, before send_leave.
//
// Args:
// - `remoteServer`: This should be a resolvable addresses within the deployment network.
// - `remoteServer`: This should be a resolvable address within the deployment network.
func (s *Server) MustLeaveRoom(t ct.TestLike, deployment FederationDeployment, remoteServer spec.ServerName, roomID string, userID string) {
t.Helper()
origin := spec.ServerName(s.serverName)
Expand Down
4 changes: 2 additions & 2 deletions tests/knocking_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ func knockingBetweenTwoUsersTest(
//
// Args:
// - `serverNames`: The list of servers to attempt to knock on the room through.
// These should be a resolvable addresses within the deplyment network.
// These should be a resolvable address within the deployment network.
func mustKnockOnRoomSynced(t *testing.T, c *client.CSAPI, roomID, reason string, serverNames []spec.ServerName) {
knockOnRoomWithStatus(t, c, roomID, reason, serverNames, 200)

Expand All @@ -317,7 +317,7 @@ func mustKnockOnRoomSynced(t *testing.T, c *client.CSAPI, roomID, reason string,
//
// Args:
// - `serverNames`: The list of servers to attempt to knock on the room through.
// These should be a resolvable addresses within the deployment network.
// These should be a resolvable address within the deployment network.
func knockOnRoomWithStatus(t *testing.T, c *client.CSAPI, roomID, reason string, serverNames []spec.ServerName, expectedStatus int) {
b := []byte("{}")
var err error
Expand Down
Loading