Merge current v2.11 into v3.1

This commit is contained in:
mmatur 2024-07-22 09:34:51 +02:00
commit c5a6b49330
No known key found for this signature in database
GPG key ID: 2FFE42FC256CFF8E
9 changed files with 71 additions and 202 deletions

View file

@ -6,7 +6,6 @@ import (
"testing"
"time"
"github.com/davecgh/go-spew/spew"
dockertypes "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm"
"github.com/stretchr/testify/assert"
@ -74,7 +73,7 @@ func TestListTasks(t *testing.T) {
taskDockerData, _ := listTasks(context.Background(), dockerClient, test.service.ID, dockerData, test.networks, test.isGlobalSVC)
if len(test.expectedTasks) != len(taskDockerData) {
t.Errorf("expected tasks %v, got %v", spew.Sdump(test.expectedTasks), spew.Sdump(taskDockerData))
t.Errorf("expected tasks %v, got %v", test.expectedTasks, taskDockerData)
}
for i, taskID := range test.expectedTasks {