1
0
Fork 0

Bump to go1.24

Co-authored-by: Romain <rtribotte@users.noreply.github.com>
This commit is contained in:
Kevin Pollet 2025-06-02 10:36:05 +02:00 committed by GitHub
parent 5f35c88805
commit cd16321dd9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
88 changed files with 284 additions and 362 deletions

View file

@ -1,7 +1,6 @@
package docker
import (
"context"
"strconv"
"testing"
@ -387,7 +386,7 @@ func TestDefaultRule(t *testing.T) {
require.NoError(t, err)
}
configuration := p.buildConfiguration(context.Background(), test.containers)
configuration := p.buildConfiguration(t.Context(), test.containers)
assert.Equal(t, test.expected, configuration)
})
@ -3504,7 +3503,7 @@ func Test_buildConfiguration(t *testing.T) {
require.NoError(t, err)
}
configuration := p.buildConfiguration(context.Background(), test.containers)
configuration := p.buildConfiguration(t.Context(), test.containers)
assert.Equal(t, test.expected, configuration)
})
@ -3676,7 +3675,7 @@ func TestDockerGetIPPort(t *testing.T) {
UseBindPortIP: true,
}
actualIP, actualPort, actualError := provider.getIPPort(context.Background(), dData, test.serverPort)
actualIP, actualPort, actualError := provider.getIPPort(t.Context(), dData, test.serverPort)
if test.expected.error {
require.Error(t, actualError)
} else {
@ -3857,7 +3856,7 @@ func TestDockerGetIPAddress(t *testing.T) {
dData.ExtraConf.Docker.Network = test.network
}
actual := provider.getIPAddress(context.Background(), dData)
actual := provider.getIPAddress(t.Context(), dData)
assert.Equal(t, test.expected, actual)
})
}
@ -3917,10 +3916,10 @@ func TestSwarmGetIPAddress(t *testing.T) {
SwarmMode: true,
}
dData, err := provider.parseService(context.Background(), test.service, test.networks)
dData, err := provider.parseService(t.Context(), test.service, test.networks)
require.NoError(t, err)
actual := provider.getIPAddress(context.Background(), dData)
actual := provider.getIPAddress(t.Context(), dData)
assert.Equal(t, test.expected, actual)
})
}
@ -3949,7 +3948,7 @@ func TestSwarmGetPort(t *testing.T) {
p := Provider{}
dData, err := p.parseService(context.Background(), test.service, test.networks)
dData, err := p.parseService(t.Context(), test.service, test.networks)
require.NoError(t, err)
actual := getPort(dData, test.serverPort)

View file

@ -83,11 +83,11 @@ func TestListTasks(t *testing.T) {
t.Parallel()
p := Provider{}
dockerData, err := p.parseService(context.Background(), test.service, test.networks)
dockerData, err := p.parseService(t.Context(), test.service, test.networks)
require.NoError(t, err)
dockerClient := &fakeTasksClient{tasks: test.tasks}
taskDockerData, _ := listTasks(context.Background(), dockerClient, test.service.ID, dockerData, test.networks, test.isGlobalSVC)
taskDockerData, _ := listTasks(t.Context(), dockerClient, test.service.ID, dockerData, test.networks, test.isGlobalSVC)
if len(test.expectedTasks) != len(taskDockerData) {
t.Errorf("expected tasks %v, got %v", test.expectedTasks, taskDockerData)
@ -277,7 +277,7 @@ func TestListServices(t *testing.T) {
p := Provider{}
serviceDockerData, err := p.listServices(context.Background(), dockerClient)
serviceDockerData, err := p.listServices(t.Context(), dockerClient)
assert.NoError(t, err)
assert.Len(t, serviceDockerData, len(test.expectedServices))
@ -395,11 +395,11 @@ func TestSwarmTaskParsing(t *testing.T) {
p := Provider{}
dData, err := p.parseService(context.Background(), test.service, test.networks)
dData, err := p.parseService(t.Context(), test.service, test.networks)
require.NoError(t, err)
for _, task := range test.tasks {
taskDockerData := parseTasks(context.Background(), task, dData, test.networks, test.isGlobalSVC)
taskDockerData := parseTasks(t.Context(), task, dData, test.networks, test.isGlobalSVC)
expected := test.expected[task.ID]
assert.Equal(t, expected.Name, taskDockerData.Name)
}