Merge current v2.11 into v3.1
This commit is contained in:
commit
c5a6b49330
9 changed files with 71 additions and 202 deletions
|
@ -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 {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue