dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-07 16:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix thelper linter

Browse Source 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
This commit is contained in:
Matthieu MOREL
2025-05-22 11:41:49 +02:00
parent 9663b36b6d
commit 9b5d8cd186
68 changed files with 1039 additions and 1014 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
integration-cli/docker_cli_service_create_test.go
View File

@@ -27,15 +27,15 @@ func (s *DockerSwarmSuite) TestServiceCreateMountVolume(c *testing.T) {
id := strings.TrimSpace(out)
var tasks []swarm.Task
poll.WaitOn(c, pollCheck(c, func(c *testing.T) (interface{}, string) {
tasks = d.GetServiceTasks(ctx, c, id)
poll.WaitOn(c, pollCheck(c, func(t *testing.T) (interface{}, string) {
tasks = d.GetServiceTasks(ctx, t, id)
return len(tasks) > 0, ""
}, checker.Equals(true)), poll.WithTimeout(defaultReconciliationTimeout))
task := tasks[0]
poll.WaitOn(c, pollCheck(c, func(c *testing.T) (interface{}, string) {
poll.WaitOn(c, pollCheck(c, func(t *testing.T) (interface{}, string) {
if task.NodeID == "" || task.Status.ContainerStatus == nil {
task = d.GetTask(ctx, c, task.ID)
task = d.GetTask(ctx, t, task.ID)
}
return task.NodeID != "" && task.Status.ContainerStatus != nil, ""
}, checker.Equals(true)), poll.WithTimeout(defaultReconciliationTimeout))
@@ -143,15 +143,15 @@ func (s *DockerSwarmSuite) TestServiceCreateWithSecretSourceTargetPaths(c *testi
assert.Equal(c, len(refs), len(testPaths))
var tasks []swarm.Task
poll.WaitOn(c, pollCheck(c, func(c *testing.T) (interface{}, string) {
tasks = d.GetServiceTasks(ctx, c, serviceName)
poll.WaitOn(c, pollCheck(c, func(t *testing.T) (interface{}, string) {
tasks = d.GetServiceTasks(ctx, t, serviceName)
return len(tasks) > 0, ""
}, checker.Equals(true)), poll.WithTimeout(defaultReconciliationTimeout))
task := tasks[0]
poll.WaitOn(c, pollCheck(c, func(c *testing.T) (interface{}, string) {
poll.WaitOn(c, pollCheck(c, func(t *testing.T) (interface{}, string) {
if task.NodeID == "" || task.Status.ContainerStatus == nil {
task = d.GetTask(ctx, c, task.ID)
task = d.GetTask(ctx, t, task.ID)
}
return task.NodeID != "" && task.Status.ContainerStatus != nil, ""
}, checker.Equals(true)), poll.WithTimeout(defaultReconciliationTimeout))
@@ -194,15 +194,15 @@ func (s *DockerSwarmSuite) TestServiceCreateWithSecretReferencedTwice(c *testing
assert.Equal(c, len(refs), 2)
var tasks []swarm.Task
poll.WaitOn(c, pollCheck(c, func(c *testing.T) (interface{}, string) {
tasks = d.GetServiceTasks(ctx, c, serviceName)
poll.WaitOn(c, pollCheck(c, func(t *testing.T) (interface{}, string) {
tasks = d.GetServiceTasks(ctx, t, serviceName)
return len(tasks) > 0, ""
}, checker.Equals(true)), poll.WithTimeout(defaultReconciliationTimeout))
task := tasks[0]
poll.WaitOn(c, pollCheck(c, func(c *testing.T) (interface{}, string) {
poll.WaitOn(c, pollCheck(c, func(t *testing.T) (interface{}, string) {
if task.NodeID == "" || task.Status.ContainerStatus == nil {
task = d.GetTask(ctx, c, task.ID)
task = d.GetTask(ctx, t, task.ID)
}
return task.NodeID != "" && task.Status.ContainerStatus != nil, ""
}, checker.Equals(true)), poll.WithTimeout(defaultReconciliationTimeout))
@@ -293,15 +293,15 @@ func (s *DockerSwarmSuite) TestServiceCreateWithConfigSourceTargetPaths(c *testi
assert.Equal(c, len(refs), len(testPaths))
var tasks []swarm.Task
poll.WaitOn(c, pollCheck(c, func(c *testing.T) (interface{}, string) {
tasks = d.GetServiceTasks(ctx, c, serviceName)
poll.WaitOn(c, pollCheck(c, func(t *testing.T) (interface{}, string) {
tasks = d.GetServiceTasks(ctx, t, serviceName)
return len(tasks) > 0, ""
}, checker.Equals(true)), poll.WithTimeout(defaultReconciliationTimeout))
task := tasks[0]
poll.WaitOn(c, pollCheck(c, func(c *testing.T) (interface{}, string) {
poll.WaitOn(c, pollCheck(c, func(t *testing.T) (interface{}, string) {
if task.NodeID == "" || task.Status.ContainerStatus == nil {
task = d.GetTask(ctx, c, task.ID)
task = d.GetTask(ctx, t, task.ID)
}
return task.NodeID != "" && task.Status.ContainerStatus != nil, ""
}, checker.Equals(true)), poll.WithTimeout(defaultReconciliationTimeout))
@@ -344,15 +344,15 @@ func (s *DockerSwarmSuite) TestServiceCreateWithConfigReferencedTwice(c *testing
assert.Equal(c, len(refs), 2)
var tasks []swarm.Task
poll.WaitOn(c, pollCheck(c, func(c *testing.T) (interface{}, string) {
tasks = d.GetServiceTasks(ctx, c, serviceName)
poll.WaitOn(c, pollCheck(c, func(t *testing.T) (interface{}, string) {
tasks = d.GetServiceTasks(ctx, t, serviceName)
return len(tasks) > 0, ""
}, checker.Equals(true)), poll.WithTimeout(defaultReconciliationTimeout))
task := tasks[0]
poll.WaitOn(c, pollCheck(c, func(c *testing.T) (interface{}, string) {
poll.WaitOn(c, pollCheck(c, func(t *testing.T) (interface{}, string) {
if task.NodeID == "" || task.Status.ContainerStatus == nil {
task = d.GetTask(ctx, c, task.ID)
task = d.GetTask(ctx, t, task.ID)
}
return task.NodeID != "" && task.Status.ContainerStatus != nil, ""
}, checker.Equals(true)), poll.WithTimeout(defaultReconciliationTimeout))
@@ -377,15 +377,15 @@ func (s *DockerSwarmSuite) TestServiceCreateMountTmpfs(c *testing.T) {
id := strings.TrimSpace(out)
var tasks []swarm.Task
poll.WaitOn(c, pollCheck(c, func(c *testing.T) (interface{}, string) {
tasks = d.GetServiceTasks(ctx, c, id)
poll.WaitOn(c, pollCheck(c, func(t *testing.T) (interface{}, string) {
tasks = d.GetServiceTasks(ctx, t, id)
return len(tasks) > 0, ""
}, checker.Equals(true)), poll.WithTimeout(defaultReconciliationTimeout))
task := tasks[0]
poll.WaitOn(c, pollCheck(c, func(c *testing.T) (interface{}, string) {
poll.WaitOn(c, pollCheck(c, func(t *testing.T) (interface{}, string) {
if task.NodeID == "" || task.Status.ContainerStatus == nil {
task = d.GetTask(ctx, c, task.ID)
task = d.GetTask(ctx, t, task.ID)
}
return task.NodeID != "" && task.Status.ContainerStatus != nil, ""
}, checker.Equals(true)), poll.WithTimeout(defaultReconciliationTimeout))
@@ -434,15 +434,15 @@ func (s *DockerSwarmSuite) TestServiceCreateWithNetworkAlias(c *testing.T) {
id := strings.TrimSpace(out)
var tasks []swarm.Task
poll.WaitOn(c, pollCheck(c, func(c *testing.T) (interface{}, string) {
tasks = d.GetServiceTasks(ctx, c, id)
poll.WaitOn(c, pollCheck(c, func(t *testing.T) (interface{}, string) {
tasks = d.GetServiceTasks(ctx, t, id)
return len(tasks) > 0, ""
}, checker.Equals(true)), poll.WithTimeout(defaultReconciliationTimeout))
task := tasks[0]
poll.WaitOn(c, pollCheck(c, func(c *testing.T) (interface{}, string) {
poll.WaitOn(c, pollCheck(c, func(t *testing.T) (interface{}, string) {
if task.NodeID == "" || task.Status.ContainerStatus == nil {
task = d.GetTask(ctx, c, task.ID)
task = d.GetTask(ctx, t, task.ID)
}
return task.NodeID != "" && task.Status.ContainerStatus != nil, ""
}, checker.Equals(true)), poll.WithTimeout(defaultReconciliationTimeout))