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

update tests because of dockerclient last update 

Signed-off-by: Victor Vieux <vieux@docker.com>
This commit is contained in:
Victor Vieux 2014-12-11 01:13:47 +00:00
parent 20f332b8d2
commit 495080fc80
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/cluster_test.go
View File

@ -4,6 +4,7 @@ import (
"testing" "testing"
"github.com/samalba/dockerclient" "github.com/samalba/dockerclient"
"github.com/samalba/dockerclient/mockclient"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
) )
@ -13,7 +14,7 @@ func createNode(t *testing.T, ID string) *Node {
assert.False(t, node.IsConnected()) assert.False(t, node.IsConnected())
client := dockerclient.NewMockClient() client := mockclient.NewMockClient()
client.On("Info").Return(mockInfo, nil) client.On("Info").Return(mockInfo, nil)
client.On("ListContainers", true, false, "").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()

11
cluster/node_test.go
View File

@ -6,6 +6,7 @@ import (
"testing" "testing"
"github.com/samalba/dockerclient" "github.com/samalba/dockerclient"
"github.com/samalba/dockerclient/mockclient"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
) )
@ -29,7 +30,7 @@ func TestNodeConnectionFailure(t *testing.T) {
assert.False(t, node.IsConnected()) assert.False(t, node.IsConnected())
// Always fail. // Always fail.
client := dockerclient.NewMockClient() client := mockclient.NewMockClient()
client.On("Info").Return(&dockerclient.Info{}, errors.New("fail")) client.On("Info").Return(&dockerclient.Info{}, errors.New("fail"))
// Connect() should fail and IsConnected() return false. // Connect() should fail and IsConnected() return false.
@ -41,7 +42,7 @@ func TestNodeConnectionFailure(t *testing.T) {
func TestOutdatedNode(t *testing.T) { func TestOutdatedNode(t *testing.T) {
node := NewNode("test") node := NewNode("test")
client := dockerclient.NewMockClient() client := mockclient.NewMockClient()
client.On("Info").Return(&dockerclient.Info{}, nil) client.On("Info").Return(&dockerclient.Info{}, nil)
assert.Error(t, node.connectClient(client)) assert.Error(t, node.connectClient(client))
@ -54,7 +55,7 @@ func TestNodeCpusMemory(t *testing.T) {
node := NewNode("test") node := NewNode("test")
assert.False(t, node.IsConnected()) assert.False(t, node.IsConnected())
client := dockerclient.NewMockClient() client := mockclient.NewMockClient()
client.On("Info").Return(mockInfo, nil) client.On("Info").Return(mockInfo, nil)
client.On("ListContainers", true, false, "").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()
@ -73,7 +74,7 @@ func TestNodeSpecs(t *testing.T) {
node := NewNode("test") node := NewNode("test")
assert.False(t, node.IsConnected()) assert.False(t, node.IsConnected())
client := dockerclient.NewMockClient() client := mockclient.NewMockClient()
client.On("Info").Return(mockInfo, nil) client.On("Info").Return(mockInfo, nil)
client.On("ListContainers", true, false, "").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()
@ -97,7 +98,7 @@ func TestNodeState(t *testing.T) {
node := NewNode("test") node := NewNode("test")
assert.False(t, node.IsConnected()) assert.False(t, node.IsConnected())
client := dockerclient.NewMockClient() client := mockclient.NewMockClient()
client.On("Info").Return(mockInfo, nil) client.On("Info").Return(mockInfo, nil)
client.On("StartMonitorEvents", mock.Anything, mock.Anything).Return() client.On("StartMonitorEvents", mock.Anything, mock.Anything).Return()