docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix with the new dockerclient version

This commit is contained in:
Victor Vieux 2014-11-13 00:45:56 +00:00
parent 6d8ecbeff6
commit 9e60bdd877
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node.go
View File

@ -108,7 +108,7 @@ func (n *Node) updateSpecs() error {
// Refresh the list and status of containers running on the node. // Refresh the list and status of containers running on the node.
func (n *Node) updateState() error { func (n *Node) updateState() error {
containers, err := n.client.ListContainers(true) containers, err := n.client.ListContainers(true, false)
if err != nil { if err != nil {
return err return err
} }

6
node_test.go
View File

@ -41,7 +41,7 @@ func TestNodeSpecs(t *testing.T) {
client := dockerclient.NewMockClient() client := dockerclient.NewMockClient()
client.On("Info").Return(mockInfo, nil) client.On("Info").Return(mockInfo, nil)
client.On("ListContainers", true).Return([]dockerclient.Container{}, nil) client.On("ListContainers", true, false).Return([]dockerclient.Container{}, nil)
client.On("StartMonitorEvents", mock.Anything, mock.Anything).Return() client.On("StartMonitorEvents", mock.Anything, mock.Anything).Return()
assert.NoError(t, node.connectClient(client)) assert.NoError(t, node.connectClient(client))
@ -66,8 +66,8 @@ func TestNodeState(t *testing.T) {
client.On("StartMonitorEvents", mock.Anything, mock.Anything).Return() client.On("StartMonitorEvents", mock.Anything, mock.Anything).Return()
// The client will return one container at first, then a second one will appear. // The client will return one container at first, then a second one will appear.
client.On("ListContainers", true).Return([]dockerclient.Container{{Id: "one"}}, nil).Once() client.On("ListContainers", true, false).Return([]dockerclient.Container{{Id: "one"}}, nil).Once()
client.On("ListContainers", true).Return([]dockerclient.Container{{Id: "one"}, {Id: "two"}}, nil).Once() client.On("ListContainers", true, false).Return([]dockerclient.Container{{Id: "one"}, {Id: "two"}}, nil).Once()
assert.NoError(t, node.connectClient(client)) assert.NoError(t, node.connectClient(client))
assert.True(t, node.IsConnected()) assert.True(t, node.IsConnected())