jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

integration: check a container state after resumning the CT 

Otherwise CT will be left in a frozen state in a fail case

Signed-off-by: Andrey Vagin <avagin@openvz.org>
This commit is contained in:
Andrey Vagin 2015-01-21 15:24:18 +03:00 committed by Andrew Vagin
parent 5162e5a81c
commit 6fc1dd5f25
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
integration/exec_test.go
View File

@ -384,12 +384,12 @@ func TestFreeze(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if state != configs.Paused {
t.Fatal("Unexpected state: ", state)
}
if err := container.Resume(); err != nil { if err := container.Resume(); err != nil {
t.Fatal(err) t.Fatal(err)
} }
if state != configs.Paused {
t.Fatal("Unexpected state: ", state)
}
stdinW.Close() stdinW.Close()
s, err := process.Wait() s, err := process.Wait()

1
integration/template_test.go
View File

@ -40,6 +40,7 @@ func newTemplateConfig(rootfs string) *configs.Config {
{Name: "NEWNET"}, {Name: "NEWNET"},
}, },
Cgroups: &cgroups.Cgroup{ Cgroups: &cgroups.Cgroup{
Name: "test",
Parent: "integration", Parent: "integration",
AllowAllDevices: false, AllowAllDevices: false,
AllowedDevices: devices.DefaultAllowedDevices, AllowedDevices: devices.DefaultAllowedDevices,