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

fix tests

This commit is contained in:
Victor Vieux 2014-12-03 12:56:29 +00:00
parent f3f4ab5153
commit f8245da596
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scheduler/filter/port_test.go
View File

@ -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.