diff --git a/changelog.d/19636.misc b/changelog.d/19636.misc new file mode 100644 index 0000000000..9ea0f04603 --- /dev/null +++ b/changelog.d/19636.misc @@ -0,0 +1 @@ +Run lint script to format Complement tests introduced in [#19509](https://github.com/element-hq/synapse/pull/19509). diff --git a/complement/tests/internal/dockerutil/files.go b/complement/tests/internal/dockerutil/files.go index 62d2c557af..e19f684368 100644 --- a/complement/tests/internal/dockerutil/files.go +++ b/complement/tests/internal/dockerutil/files.go @@ -14,7 +14,13 @@ import ( // // Internally, produces an uncompressed single-file tape archive (tar) that is sent to the docker // daemon to be unpacked into the container filesystem. -func WriteFileIntoContainer(t *testing.T, docker *client.Client, containerID string, path string, data []byte) error { +func WriteFileIntoContainer( + t *testing.T, + docker *client.Client, + containerID string, + path string, + data []byte, +) error { // Create a fake/virtual tar file in memory that we can copy to the container // via https://stackoverflow.com/a/52131297/796832 var buf bytes.Buffer @@ -25,7 +31,11 @@ func WriteFileIntoContainer(t *testing.T, docker *client.Client, containerID str Size: int64(len(data)), }) if err != nil { - return fmt.Errorf("WriteIntoContainer: failed to write tarball header for %s: %v", path, err) + return fmt.Errorf( + "WriteIntoContainer: failed to write tarball header for %s: %v", + path, + err, + ) } _, err = tw.Write([]byte(data)) if err != nil { @@ -34,7 +44,11 @@ func WriteFileIntoContainer(t *testing.T, docker *client.Client, containerID str err = tw.Close() if err != nil { - return fmt.Errorf("WriteIntoContainer: failed to close tarball writer for %s: %w", path, err) + return fmt.Errorf( + "WriteIntoContainer: failed to close tarball writer for %s: %w", + path, + err, + ) } // Put our new fake file in the container volume diff --git a/complement/tests/oidc_test.go b/complement/tests/oidc_test.go index bddb382058..deabf49950 100644 --- a/complement/tests/oidc_test.go +++ b/complement/tests/oidc_test.go @@ -93,7 +93,10 @@ func TestOIDCProviderUnavailable(t *testing.T) { // by the user's browser in order to start the login flow. queryParams := url.Values{} queryParams.Add("redirectUrl", "http://redirect.invalid/redirect") - res := unauthedClient.Do(t, "GET", []string{"_matrix", "client", "v3", "login", "sso", "redirect", "oidc-test_provider"}, + res := unauthedClient.Do( + t, + "GET", + []string{"_matrix", "client", "v3", "login", "sso", "redirect", "oidc-test_provider"}, client.WithQueries(queryParams), )