From f8245da59675a7b4d93bd5cd46c693d7d135fb59 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Wed, 3 Dec 2014 12:56:29 +0000 Subject: [PATCH] fix tests --- scheduler/filter/port_test.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/scheduler/filter/port_test.go b/scheduler/filter/port_test.go index eeead7a901..3f7b66ccd8 100644 --- a/scheduler/filter/port_test.go +++ b/scheduler/filter/port_test.go @@ -57,8 +57,7 @@ func TestPortFilterNoConflicts(t *testing.T) { assert.Equal(t, result, nodes) // Add a container taking a different (4242) port. - container := &cluster.Container{Container: dockerclient.Container{Id: "c1"}, Info: dockerclient.ContainerInfo{}} - container.Info.NetworkSettings.Ports = makeBinding("", "4242") + container := &cluster.Container{Container: dockerclient.Container{Id: "c1"}, Info: dockerclient.ContainerInfo{HostConfig: &dockerclient.HostConfig{PortBindings: makeBinding("", "4242")}}} assert.NoError(t, nodes[0].AddContainer(container)) // Since no node is using port 80, there should be no filter @@ -80,8 +79,7 @@ func TestPortFilterSimple(t *testing.T) { ) // Add a container taking away port 80 to nodes[0]. - container := &cluster.Container{Container: dockerclient.Container{Id: "c1"}, Info: dockerclient.ContainerInfo{}} - container.Info.NetworkSettings.Ports = makeBinding("", "80") + container := &cluster.Container{Container: dockerclient.Container{Id: "c1"}, Info: dockerclient.ContainerInfo{HostConfig: &dockerclient.HostConfig{PortBindings: makeBinding("", "80")}}} assert.NoError(t, nodes[0].AddContainer(container)) // Request port 80. @@ -110,8 +108,7 @@ func TestPortFilterDifferentInterfaces(t *testing.T) { ) // Add a container taking away port 80 on every interface to nodes[0]. - container := &cluster.Container{Container: dockerclient.Container{Id: "c1"}, Info: dockerclient.ContainerInfo{}} - container.Info.NetworkSettings.Ports = makeBinding("", "80") + container := &cluster.Container{Container: dockerclient.Container{Id: "c1"}, Info: dockerclient.ContainerInfo{HostConfig: &dockerclient.HostConfig{PortBindings: makeBinding("", "80")}}} assert.NoError(t, nodes[0].AddContainer(container)) // Request port 80 for the local interface. @@ -129,8 +126,7 @@ func TestPortFilterDifferentInterfaces(t *testing.T) { // Add a container taking away port 4242 on the local interface of // nodes[1]. - container = &cluster.Container{Container: dockerclient.Container{Id: "c1"}, Info: dockerclient.ContainerInfo{}} - container.Info.NetworkSettings.Ports = makeBinding("127.0.0.1", "4242") + container = &cluster.Container{Container: dockerclient.Container{Id: "c1"}, Info: dockerclient.ContainerInfo{HostConfig: &dockerclient.HostConfig{PortBindings: makeBinding("127.0.0.1", "4242")}}} assert.NoError(t, nodes[1].AddContainer(container)) // Request port 4242 on the same interface.