toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update local code for updated modules

Browse Source 
Some tests had to be skipped as there's some issues to address, and
some of the result-types cannot be mocked / stubbed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-10-22 17:05:31 +02:00
parent aeb78091a0
commit 4f7c07cfc2
190 changed files with 3020 additions and 2585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
cli/command/node/inspect_test.go
View File

@ -10,6 +10,7 @@ import (
"github.com/docker/cli/internal/test/builders"
"github.com/moby/moby/api/types/swarm"
"github.com/moby/moby/api/types/system"
"github.com/moby/moby/client"
"gotest.tools/v3/assert"
"gotest.tools/v3/golden"
)
@ -18,7 +19,7 @@ func TestNodeInspectErrors(t *testing.T) {
testCases := []struct {
args []string
flags map[string]string
nodeInspectFunc func() (swarm.Node, []byte, error)
nodeInspectFunc func() (client.NodeInspectResult, error)
infoFunc func() (system.Info, error)
expectedError string
}{
@ -34,8 +35,8 @@ func TestNodeInspectErrors(t *testing.T) {
},
{
args: []string{"nodeID"},
nodeInspectFunc: func() (swarm.Node, []byte, error) {
return swarm.Node{}, []byte{}, errors.New("error inspecting the node")
nodeInspectFunc: func() (client.NodeInspectResult, error) {
return client.NodeInspectResult{}, errors.New("error inspecting the node")
},
infoFunc: func() (system.Info, error) {
return system.Info{}, errors.New("error asking for node info")
@ -44,8 +45,8 @@ func TestNodeInspectErrors(t *testing.T) {
},
{
args: []string{"self"},
nodeInspectFunc: func() (swarm.Node, []byte, error) {
return swarm.Node{}, []byte{}, errors.New("error inspecting the node")
nodeInspectFunc: func() (client.NodeInspectResult, error) {
return client.NodeInspectResult{}, errors.New("error inspecting the node")
},
infoFunc: func() (system.Info, error) {
return system.Info{Swarm: swarm.Info{NodeID: "abc"}}, nil
@ -82,26 +83,30 @@ func TestNodeInspectErrors(t *testing.T) {
func TestNodeInspectPretty(t *testing.T) {
testCases := []struct {
name string
nodeInspectFunc func() (swarm.Node, []byte, error)
nodeInspectFunc func() (client.NodeInspectResult, error)
}{
{
name: "simple",
nodeInspectFunc: func() (swarm.Node, []byte, error) {
return *builders.Node(builders.NodeLabels(map[string]string{
"lbl1": "value1",
})), []byte{}, nil
nodeInspectFunc: func() (client.NodeInspectResult, error) {
return client.NodeInspectResult{
Node: *builders.Node(builders.NodeLabels(map[string]string{"lbl1": "value1"})),
}, nil
},
},
{
name: "manager",
nodeInspectFunc: func() (swarm.Node, []byte, error) {
return *builders.Node(builders.Manager()), []byte{}, nil
nodeInspectFunc: func() (client.NodeInspectResult, error) {
return client.NodeInspectResult{
Node: *builders.Node(builders.Manager()),
}, nil
},
},
{
name: "manager-leader",
nodeInspectFunc: func() (swarm.Node, []byte, error) {
return *builders.Node(builders.Manager(builders.Leader())), []byte{}, nil
nodeInspectFunc: func() (client.NodeInspectResult, error) {
return client.NodeInspectResult{
Node: *builders.Node(builders.Manager(builders.Leader())),
}, nil
},
},
}