mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-06 14:33:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make the linter happy

Browse source
This commit is contained in:
Till Faelligen 2024-08-01 19:48:25 +02:00
parent 44bf1004fd
commit a036a4c71a
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmd/dendrite-upgrade-tests/main.go
View file

@ -410,7 +410,7 @@ func runImage(dockerClient *client.Client, volumeName string, branchNameToImageI
} }
containerID = body.ID containerID = body.ID
err = dockerClient.ContainerStart(ctx, containerID, types.ContainerStartOptions{}) err = dockerClient.ContainerStart(ctx, containerID, container.StartOptions{})
if err != nil { if err != nil {
return "", "", fmt.Errorf("failed to ContainerStart: %s", err) return "", "", fmt.Errorf("failed to ContainerStart: %s", err)
} }
@ -442,7 +442,7 @@ func runImage(dockerClient *client.Client, volumeName string, branchNameToImageI
lastErr = nil lastErr = nil
break break
} }
logs, err := dockerClient.ContainerLogs(context.Background(), containerID, types.ContainerLogsOptions{ logs, err := dockerClient.ContainerLogs(context.Background(), containerID, container.LogsOptions{
ShowStdout: true, ShowStdout: true,
ShowStderr: true, ShowStderr: true,
Follow: true, Follow: true,
@ -463,7 +463,7 @@ func runImage(dockerClient *client.Client, volumeName string, branchNameToImageI
} }
func destroyContainer(dockerClient *client.Client, containerID string) { func destroyContainer(dockerClient *client.Client, containerID string) {
err := dockerClient.ContainerRemove(context.TODO(), containerID, types.ContainerRemoveOptions{ err := dockerClient.ContainerRemove(context.TODO(), containerID, container.RemoveOptions{
Force: true, Force: true,
}) })
if err != nil { if err != nil {
@ -550,7 +550,7 @@ func verifyTests(dockerClient *client.Client, volumeName string, versions []*sem
// cleanup old containers/volumes from a previous run // cleanup old containers/volumes from a previous run
func cleanup(dockerClient *client.Client) { func cleanup(dockerClient *client.Client) {
// ignore all errors, we are just cleaning up and don't want to fail just because we fail to cleanup // ignore all errors, we are just cleaning up and don't want to fail just because we fail to cleanup
containers, _ := dockerClient.ContainerList(context.Background(), types.ContainerListOptions{ containers, _ := dockerClient.ContainerList(context.Background(), container.ListOptions{
Filters: label(dendriteUpgradeTestLabel), Filters: label(dendriteUpgradeTestLabel),
All: true, All: true,
}) })
@ -558,7 +558,7 @@ func cleanup(dockerClient *client.Client) {
log.Printf("Removing container: %v %v\n", c.ID, c.Names) log.Printf("Removing container: %v %v\n", c.ID, c.Names)
timeout := 1 timeout := 1
_ = dockerClient.ContainerStop(context.Background(), c.ID, container.StopOptions{Timeout: &timeout}) _ = dockerClient.ContainerStop(context.Background(), c.ID, container.StopOptions{Timeout: &timeout})
_ = dockerClient.ContainerRemove(context.Background(), c.ID, types.ContainerRemoveOptions{ _ = dockerClient.ContainerRemove(context.Background(), c.ID, container.RemoveOptions{
Force: true, Force: true,
}) })
} }