clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-06 21:51:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

More thorough test case, use container.Stop() instead of lxc-kill,

Browse Source 
use setStopped() during the restore step
This commit is contained in:
shin-
2013-04-02 07:01:43 -07:00
parent 8edf0ca7f3
commit c780ff5ae7
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime_test.go
+13 -3
View File
@@ -297,10 +297,15 @@ func TestRestore(t *testing.T) {
t.Fatal(err)
}
// Simulate a crash/manual quit of dockerd: process dies, states stays 'Running'
if err := exec.Command("lxc-kill", "-n", container1_1.Id, "9").Run(); err == nil {
t.Fatalf("container supposed to be killed (return error 255). Success received.")
if !container1_1.State.Running {
t.Fatalf("Container %v should appear as running but isn't", container1_1.Id)
}
// Simulate a crash/manual quit of dockerd: process dies, states stays 'Running'
if err := container1_1.Stop(); err != nil {
t.Fatalf("Could not stop container: %v", err)
}
container1_1.State.Running = true
if len(runtime1.List()) != 2 {
@@ -310,6 +315,10 @@ func TestRestore(t *testing.T) {
t.Fatal(err)
}
if !container1_1.State.Running {
t.Fatalf("Container %v should appear as running but isn't", container1_1.Id)
}
// Here are are simulating a docker restart - that is, reloading all containers
// from scratch
runtime2, err := NewRuntimeFromDirectory(root)
@@ -323,6 +332,7 @@ func TestRestore(t *testing.T) {
runningCount := 0
for _, c := range runtime2.List() {
if c.State.Running {
t.Errorf("Running container found: %v (%v)", c.Id, c.Path)
runningCount++
}
}