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 2013-10-21 15:42:27 -07:00
parent 6c863b49ef
commit dbe7d67c18
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
runtime_test.go
View File

@ -536,7 +536,7 @@ func TestReloadContainerLinks(t *testing.T) {
runtime1 := mkRuntime(t) runtime1 := mkRuntime(t)
defer nuke(runtime1) defer nuke(runtime1)
// Create a container with one instance of docker // 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) defer runtime1.Destroy(container1)
// Create a second container meant to be killed // Create a second container meant to be killed
@ -560,17 +560,13 @@ func TestReloadContainerLinks(t *testing.T) {
} }
if !container1.State.Running { 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 { if len(runtime1.List()) != 2 {
t.Errorf("Expected 2 container, %v found", len(runtime1.List())) 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 // Here are are simulating a docker restart - that is, reloading all containers
// from scratch // from scratch
runtime1.config.AutoRestart = true runtime1.config.AutoRestart = true