update tests

Signed-off-by: Victor Vieux <vieux@docker.com>
This commit is contained in:
Victor Vieux 2015-08-10 23:09:52 -07:00
parent 2a70ff3e1f
commit d5c41a38c1
2 changed files with 16 additions and 1 deletions

View File

@ -33,6 +33,7 @@ func TestContainerLookup(t *testing.T) {
Config: cluster.BuildContainerConfig(dockerclient.ContainerConfig{
Labels: map[string]string{
"com.docker.swarm.mesos.task": "task1-id",
"com.docker.swarm.mesos.name": "container1-name1",
},
}),
}
@ -45,13 +46,25 @@ func TestContainerLookup(t *testing.T) {
Config: cluster.BuildContainerConfig(dockerclient.ContainerConfig{
Labels: map[string]string{
"com.docker.swarm.mesos.task": "task2-id",
"com.docker.swarm.mesos.name": "con",
},
}),
}
s := createSlave(t, "test-engine", container1, container2)
container3 := &cluster.Container{
Container: dockerclient.Container{
Id: "container3-id",
Names: []string{"/container3-name"},
},
Config: cluster.BuildContainerConfig(dockerclient.ContainerConfig{}),
}
s := createSlave(t, "test-engine", container1, container2, container3)
c.slaves[s.id] = s
// Hide container without `com.docker.swarm.mesos.task`
assert.Equal(t, len(c.Containers()), 2)
// Invalid lookup
assert.Nil(t, c.Container("invalid-id"))
assert.Nil(t, c.Container(""))

View File

@ -84,6 +84,8 @@ func TestContainerLookup(t *testing.T) {
n := createEngine(t, "test-engine", container1, container2)
c.engines[n.ID] = n
assert.Equal(t, len(c.Containers()), 2)
// Invalid lookup
assert.Nil(t, c.Container("invalid-id"))
assert.Nil(t, c.Container(""))