Upgraded dockerclient API.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi 2014-11-10 14:11:33 -08:00
parent 05864a3b2a
commit 2a755a1c1a
2 changed files with 5 additions and 5 deletions

View File

@ -38,7 +38,7 @@ type Node struct {
mux sync.Mutex
ch chan bool
containers map[string]*Container
client dockerclient.DockerClientInterface
client dockerclient.Client
eventHandler EventHandler
}
@ -59,7 +59,7 @@ func (n *Node) Connect(config *tls.Config) error {
return n.connectClient(c)
}
func (n *Node) connectClient(client dockerclient.DockerClientInterface) error {
func (n *Node) connectClient(client dockerclient.Client) error {
n.client = client
// Fetch the engine labels.

View File

@ -25,7 +25,7 @@ func TestNodeConnectionFailure(t *testing.T) {
assert.False(t, node.IsConnected())
// Always fail.
client := dockerclient.NewDockerClientMock()
client := dockerclient.NewMockClient()
client.On("Info").Return(&dockerclient.Info{}, errors.New("fail"))
// Connect() should fail and IsConnected() return false.
@ -39,7 +39,7 @@ func TestNodeSpecs(t *testing.T) {
node := NewNode("test", "test")
assert.False(t, node.IsConnected())
client := dockerclient.NewDockerClientMock()
client := dockerclient.NewMockClient()
client.On("Info").Return(mockInfo, nil)
client.On("ListContainers", true).Return([]dockerclient.Container{}, nil)
client.On("StartMonitorEvents", mock.Anything, mock.Anything).Return()
@ -61,7 +61,7 @@ func TestNodeState(t *testing.T) {
node := NewNode("test", "test")
assert.False(t, node.IsConnected())
client := dockerclient.NewDockerClientMock()
client := dockerclient.NewMockClient()
client.On("Info").Return(mockInfo, nil)
client.On("StartMonitorEvents", mock.Anything, mock.Anything).Return()