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

Fix tests for the NewNode API changes. 

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi 2014-11-20 15:56:12 -08:00
parent 1476d3e8af
commit dacb3e2ef1
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/node_test.go
View File

@ -22,7 +22,7 @@ var (
) )
func TestNodeConnectionFailure(t *testing.T) { func TestNodeConnectionFailure(t *testing.T) {
node := NewNode("test", "test") node := NewNode("test")
assert.False(t, node.IsConnected()) assert.False(t, node.IsConnected())
// Always fail. // Always fail.
@ -37,7 +37,7 @@ func TestNodeConnectionFailure(t *testing.T) {
} }
func TestNodeSpecs(t *testing.T) { func TestNodeSpecs(t *testing.T) {
node := NewNode("test", "test") node := NewNode("test")
assert.False(t, node.IsConnected()) assert.False(t, node.IsConnected())
client := dockerclient.NewMockClient() client := dockerclient.NewMockClient()
@ -59,7 +59,7 @@ func TestNodeSpecs(t *testing.T) {
} }
func TestNodeState(t *testing.T) { func TestNodeState(t *testing.T) {
node := NewNode("test", "test") node := NewNode("test")
assert.False(t, node.IsConnected()) assert.False(t, node.IsConnected())
client := dockerclient.NewMockClient() client := dockerclient.NewMockClient()

6
scheduler/filter/attribute_test.go
View File

@ -12,9 +12,9 @@ func TestAttributeFilter(t *testing.T) {
var ( var (
f = AttributeFilter{} f = AttributeFilter{}
nodes = []*cluster.Node{ nodes = []*cluster.Node{
cluster.NewNode("node-1", ""), cluster.NewNode("node-1"),
cluster.NewNode("node-2", ""), cluster.NewNode("node-2"),
cluster.NewNode("node-3", ""), cluster.NewNode("node-3"),
} }
result []*cluster.Node result []*cluster.Node
err error err error

18
scheduler/filter/port_test.go
View File

@ -24,9 +24,9 @@ func TestPortFilterNoConflicts(t *testing.T) {
var ( var (
p = PortFilter{} p = PortFilter{}
nodes = []*cluster.Node{ nodes = []*cluster.Node{
cluster.NewNode("node-1", ""), cluster.NewNode("node-1"),
cluster.NewNode("node-2", ""), cluster.NewNode("node-2"),
cluster.NewNode("node-3", ""), cluster.NewNode("node-3"),
} }
result []*cluster.Node result []*cluster.Node
err error err error
@ -71,9 +71,9 @@ func TestPortFilterSimple(t *testing.T) {
var ( var (
p = PortFilter{} p = PortFilter{}
nodes = []*cluster.Node{ nodes = []*cluster.Node{
cluster.NewNode("node-1", ""), cluster.NewNode("node-1"),
cluster.NewNode("node-2", ""), cluster.NewNode("node-2"),
cluster.NewNode("node-3", ""), cluster.NewNode("node-3"),
} }
result []*cluster.Node result []*cluster.Node
err error err error
@ -101,9 +101,9 @@ func TestPortFilterDifferentInterfaces(t *testing.T) {
var ( var (
p = PortFilter{} p = PortFilter{}
nodes = []*cluster.Node{ nodes = []*cluster.Node{
cluster.NewNode("node-1", ""), cluster.NewNode("node-1"),
cluster.NewNode("node-2", ""), cluster.NewNode("node-2"),
cluster.NewNode("node-3", ""), cluster.NewNode("node-3"),
} }
result []*cluster.Node result []*cluster.Node
err error err error

3
scheduler/strategy/binpacking_test.go
View File

@ -10,7 +10,8 @@ import (
) )
func createNode(ID string, memory int64, cpus int64) *cluster.Node { func createNode(ID string, memory int64, cpus int64) *cluster.Node {
node := cluster.NewNode(ID, "") node := cluster.NewNode(ID)
node.ID = ID
node.Memory = memory * 1024 * 1024 * 1024 node.Memory = memory * 1024 * 1024 * 1024
node.Cpus = cpus node.Cpus = cpus
return node return node