fix tests

Upstream-commit: dbe7d67c183d2fcea2748dd09751c79bc9810b88
Component: engine
This commit is contained in:
Victor Vieux
2013-10-25 15:13:25 -07:00
parent 5b0bbe7633
commit 22100af3d2
+2 -6
View File
@@ -536,7 +536,7 @@ func TestReloadContainerLinks(t *testing.T) {
runtime1 := mkRuntime(t)
defer nuke(runtime1)
// Create a container with one instance of docker
container1, _, _ := mkContainer(runtime1, []string{"_", "ls", "-al"}, t)
container1, _, _ := mkContainer(runtime1, []string{"-i", "_", "/bin/sh"}, t)
defer runtime1.Destroy(container1)
// Create a second container meant to be killed
@@ -560,17 +560,13 @@ func TestReloadContainerLinks(t *testing.T) {
}
if !container1.State.Running {
t.Fatalf("Container %s should appear as running bu isn't", container1.ID)
t.Fatalf("Container %s should appear as running but isn't", container1.ID)
}
if len(runtime1.List()) != 2 {
t.Errorf("Expected 2 container, %v found", len(runtime1.List()))
}
if !container2.State.Running {
t.Fatalf("Container %v should appear as running but isn't", container2.ID)
}
// Here are are simulating a docker restart - that is, reloading all containers
// from scratch
runtime1.config.AutoRestart = true