Allow user-configurable DOCKER_HOST

actions/check.go

@@ -8,9 +8,7 @@ import (
 
 func watchtowerContainersFilter(c container.Container) bool { return c.IsWatchtower() }
 
-func CheckPrereqs() error {
-	client := container.NewClient()
-
+func CheckPrereqs(client container.Client) error {
 	containers, err := client.ListContainers(watchtowerContainersFilter)
 	if err != nil {
 		return err

actions/check_test.go

@@ -0,0 +1,81 @@
+package actions
+
+import (
+	"errors"
+	"testing"
+	"time"
+
+	"github.com/CenturyLinkLabs/watchtower/container"
+	"github.com/CenturyLinkLabs/watchtower/container/mockclient"
+	"github.com/samalba/dockerclient"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+)
+
+func TestCheckPrereqs_Success(t *testing.T) {
+	cc := &dockerclient.ContainerConfig{
+		Labels: map[string]string{"com.centurylinklabs.watchtower": "true"},
+	}
+	c1 := *container.NewContainer(
+		&dockerclient.ContainerInfo{
+			Name:    "c1",
+			Config:  cc,
+			Created: "2015-07-01T12:00:01.000000000Z",
+		},
+		nil,
+	)
+	c2 := *container.NewContainer(
+		&dockerclient.ContainerInfo{
+			Name:    "c2",
+			Config:  cc,
+			Created: "2015-07-01T12:00:00.000000000Z",
+		},
+		nil,
+	)
+	cs := []container.Container{c1, c2}
+
+	client := &mockclient.MockClient{}
+	client.On("ListContainers", mock.AnythingOfType("container.ContainerFilter")).Return(cs, nil)
+	client.On("Stop", c2, time.Duration(60)).Return(nil)
+
+	err := CheckPrereqs(client)
+
+	assert.NoError(t, err)
+	client.AssertExpectations(t)
+}
+
+func TestCheckPrereqs_OnlyOneContainer(t *testing.T) {
+	cc := &dockerclient.ContainerConfig{
+		Labels: map[string]string{"com.centurylinklabs.watchtower": "true"},
+	}
+	c1 := *container.NewContainer(
+		&dockerclient.ContainerInfo{
+			Name:    "c1",
+			Config:  cc,
+			Created: "2015-07-01T12:00:01.000000000Z",
+		},
+		nil,
+	)
+	cs := []container.Container{c1}
+
+	client := &mockclient.MockClient{}
+	client.On("ListContainers", mock.AnythingOfType("container.ContainerFilter")).Return(cs, nil)
+
+	err := CheckPrereqs(client)
+
+	assert.NoError(t, err)
+	client.AssertExpectations(t)
+}
+
+func TestCheckPrereqs_ListError(t *testing.T) {
+	cs := []container.Container{}
+
+	client := &mockclient.MockClient{}
+	client.On("ListContainers", mock.AnythingOfType("container.ContainerFilter")).Return(cs, errors.New("oops"))
+
+	err := CheckPrereqs(client)
+
+	assert.Error(t, err)
+	assert.EqualError(t, err, "oops")
+	client.AssertExpectations(t)
+}

actions/update.go

@@ -12,8 +12,7 @@ var (
 
 func allContainersFilter(container.Container) bool { return true }
 
-func Update() error {
-	client := container.NewClient()
+func Update(client container.Client) error {
 	containers, err := client.ListContainers(allContainersFilter)
 	if err != nil {
 		return err

actions/update_test.go

@@ -5,17 +5,18 @@ import (
 	"testing"
 
 	"github.com/CenturyLinkLabs/watchtower/container"
+	"github.com/samalba/dockerclient"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestCheckDependencies(t *testing.T) {
 	cs := []container.Container{
-		container.NewTestContainer("1", []string{}),
-		container.NewTestContainer("2", []string{"1:"}),
-		container.NewTestContainer("3", []string{"2:"}),
-		container.NewTestContainer("4", []string{"3:"}),
-		container.NewTestContainer("5", []string{"4:"}),
-		container.NewTestContainer("6", []string{"5:"}),
+		newTestContainer("1", []string{}),
+		newTestContainer("2", []string{"1:"}),
+		newTestContainer("3", []string{"2:"}),
+		newTestContainer("4", []string{"3:"}),
+		newTestContainer("5", []string{"4:"}),
+		newTestContainer("6", []string{"5:"}),
 	}
 	cs[3].Stale = true
 
@@ -36,3 +37,15 @@ func TestRandName(t *testing.T) {
 
 	assert.True(t, validPattern.MatchString(name))
 }
+
+func newTestContainer(name string, links []string) container.Container {
+	return *container.NewContainer(
+		&dockerclient.ContainerInfo{
+			Name: name,
+			HostConfig: &dockerclient.HostConfig{
+				Links: links,
+			},
+		},
+		nil,
+	)
+}