fix tests

alexei-led · Sep 8, 2016 · 0dfd421 · 0dfd421
1 parent 7f0ab85
commit 0dfd421
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 18 deletions.
diff --git a/action/chaos_test.go b/action/chaos_test.go
@@ -475,8 +475,8 @@ func TestNetemDealyByName(t *testing.T) {
 	client := container.NewMockSamalbaClient()
 	client.On("ListContainers", mock.AnythingOfType("container.Filter")).Return(cs, nil)
 	for _, c := range cs {
-		client.On("NetemContainer", c, "eth1", []string{"delay", "120ms", "25ms", "0.23"}, net.ParseIP(""), 1*time.Millisecond).Return(nil)
-		client.On("StopNetemContainer", c, "eth1").Return(nil)
+		client.On("NetemContainer", c, "eth1", []string{"delay", "120ms", "25ms", "0.23"}, net.ParseIP(""), 1*time.Millisecond, "").Return(nil)
+		client.On("StopNetemContainer", c, "eth1", "").Return(nil)
 	}
 	// do action
 	pumba := pumbaChaos{}
@@ -500,8 +500,8 @@ func TestNetemDealyByNameRandom(t *testing.T) {
 	}
 	client := container.NewMockSamalbaClient()
 	client.On("ListContainers", mock.AnythingOfType("container.Filter")).Return(cs, nil)
-	client.On("NetemContainer", mock.AnythingOfType("container.Container"), "eth1", []string{"delay", "120ms", "25ms", "5.50", "distribution", "uniform"}, net.ParseIP(""), 1*time.Millisecond).Return(nil)
-	client.On("StopNetemContainer", mock.AnythingOfType("container.Container"), "eth1").Return(nil)
+	client.On("NetemContainer", mock.AnythingOfType("container.Container"), "eth1", []string{"delay", "120ms", "25ms", "5.50", "distribution", "uniform"}, net.ParseIP(""), 1*time.Millisecond, "").Return(nil)
+	client.On("StopNetemContainer", mock.AnythingOfType("container.Container"), "eth1", "").Return(nil)
 	// do action
 	RandomMode = true
 	pumba := pumbaChaos{}
@@ -526,8 +526,8 @@ func TestNetemDealyByPattern(t *testing.T) {
 	client := container.NewMockSamalbaClient()
 	client.On("ListContainers", mock.AnythingOfType("container.Filter")).Return(cs, nil)
 	for _, c := range cs {
-		client.On("NetemContainer", c, "eth1", []string{"delay", "120ms", "25ms", "15.00"}, net.ParseIP(""), 1*time.Millisecond).Return(nil)
-		client.On("StopNetemContainer", c, "eth1").Return(nil)
+		client.On("NetemContainer", c, "eth1", []string{"delay", "120ms", "25ms", "15.00"}, net.ParseIP(""), 1*time.Millisecond, "").Return(nil)
+		client.On("StopNetemContainer", c, "eth1", "").Return(nil)
 	}
 	// do action
 	pumba := pumbaChaos{}
@@ -552,8 +552,8 @@ func TestNetemDealyByPatternIPFilter(t *testing.T) {
 	client := container.NewMockSamalbaClient()
 	client.On("ListContainers", mock.AnythingOfType("container.Filter")).Return(cs, nil)
 	for _, c := range cs {
-		client.On("NetemContainer", c, "eth1", []string{"delay", "120ms", "25ms", "10.00"}, ip, 1*time.Millisecond).Return(nil)
-		client.On("StopNetemContainer", c, "eth1").Return(nil)
+		client.On("NetemContainer", c, "eth1", []string{"delay", "120ms", "25ms", "10.00"}, ip, 1*time.Millisecond, "").Return(nil)
+		client.On("StopNetemContainer", c, "eth1", "").Return(nil)
 	}
 	// do action
 	pumba := pumbaChaos{}
@@ -576,8 +576,8 @@ func TestNetemDealyByPatternRandom(t *testing.T) {
 	}
 	client := container.NewMockSamalbaClient()
 	client.On("ListContainers", mock.AnythingOfType("container.Filter")).Return(cs, nil)
-	client.On("NetemContainer", mock.AnythingOfType("container.Container"), "eth1", []string{"delay", "120ms", "25ms", "10.20"}, net.ParseIP(""), 1*time.Millisecond).Return(nil)
-	client.On("StopNetemContainer", mock.AnythingOfType("container.Container"), "eth1").Return(nil)
+	client.On("NetemContainer", mock.AnythingOfType("container.Container"), "eth1", []string{"delay", "120ms", "25ms", "10.20"}, net.ParseIP(""), 1*time.Millisecond, "").Return(nil)
+	client.On("StopNetemContainer", mock.AnythingOfType("container.Container"), "eth1", "").Return(nil)
 	// do action
 	RandomMode = true
 	pumba := pumbaChaos{}
@@ -601,8 +601,8 @@ func TestNetemLossByName(t *testing.T) {
 	client := container.NewMockSamalbaClient()
 	client.On("ListContainers", mock.AnythingOfType("container.Filter")).Return(cs, nil)
 	for _, c := range cs {
-		client.On("NetemContainer", c, "eth1", []string{"loss", "11.50", "25.53"}, net.ParseIP(""), 1*time.Millisecond).Return(nil)
-		client.On("StopNetemContainer", c, "eth1").Return(nil)
+		client.On("NetemContainer", c, "eth1", []string{"loss", "11.50", "25.53"}, net.ParseIP(""), 1*time.Millisecond, "").Return(nil)
+		client.On("StopNetemContainer", c, "eth1", "").Return(nil)
 	}
 	// do action
 	pumba := pumbaChaos{}
@@ -644,8 +644,8 @@ func TestNetemLossStateByName(t *testing.T) {
 	client := container.NewMockSamalbaClient()
 	client.On("ListContainers", mock.AnythingOfType("container.Filter")).Return(cs, nil)
 	for _, c := range cs {
-		client.On("NetemContainer", c, "eth1", []string{"loss", "state", "11.50", "12.60", "13.70", "14.80", "15.90"}, net.ParseIP(""), 1*time.Millisecond).Return(nil)
-		client.On("StopNetemContainer", c, "eth1").Return(nil)
+		client.On("NetemContainer", c, "eth1", []string{"loss", "state", "11.50", "12.60", "13.70", "14.80", "15.90"}, net.ParseIP(""), 1*time.Millisecond, "").Return(nil)
+		client.On("StopNetemContainer", c, "eth1", "").Return(nil)
 	}
 	// do action
 	pumba := pumbaChaos{}
@@ -686,8 +686,8 @@ func TestNetemLossGEmodelByName(t *testing.T) {
 	client := container.NewMockSamalbaClient()
 	client.On("ListContainers", mock.AnythingOfType("container.Filter")).Return(cs, nil)
 	for _, c := range cs {
-		client.On("NetemContainer", c, "eth1", []string{"loss", "gemodel", "11.50", "12.60", "13.70", "14.80"}, net.ParseIP(""), 1*time.Millisecond).Return(nil)
-		client.On("StopNetemContainer", c, "eth1").Return(nil)
+		client.On("NetemContainer", c, "eth1", []string{"loss", "gemodel", "11.50", "12.60", "13.70", "14.80"}, net.ParseIP(""), 1*time.Millisecond, "").Return(nil)
+		client.On("StopNetemContainer", c, "eth1", "").Return(nil)
 	}
 	// do action
 	pumba := pumbaChaos{}

diff --git a/container/client_test.go b/container/client_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/docker/engine-api/types"
 	"github.com/docker/engine-api/types/container"
 	"github.com/docker/engine-api/types/network"
+	"github.com/docker/go-connections/nat"
 	"github.com/samalba/dockerclient/mockclient"
 	"golang.org/x/net/context"
 
@@ -666,14 +667,19 @@ func Test_tcContainerCommand(t *testing.T) {
 		Cmd:        []string{"test", "me"},
 		Image:      "pumba/tcimage",
 	}
+	// host config
 	hconfig := container.HostConfig{
 		// auto remove container on tc command exit
 		AutoRemove: true,
 		// NET_ADMIN is required for "tc netem"
 		CapAdd: []string{"NET_ADMIN"},
 		// use target container network stack
-		NetworkMode: "container",
-		IpcMode:     container.IpcMode("container:targetID"),
+		NetworkMode: container.NetworkMode("container:targetID"),
+		// others
+		PortBindings: nat.PortMap{},
+		DNS:          []string{},
+		DNSOptions:   []string{},
+		DNSSearch:    []string{},
 	}
 
 	ctx := context.Background()