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

Merge pull request #11208 from LK4D4/new_libcontainer_api

Browse Source 
New libcontainer api
This commit is contained in:
Jessie Frazelle
2015-03-10 07:50:19 -07:00
parent c5af44e6d0 68ba5f0b69
commit 2fb89b2e2c
169 changed files with 9270 additions and 5641 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-cli/docker_cli_exec_test.go
+4 -24
View File
@@ -60,7 +60,7 @@ func TestExecInteractiveStdinClose(t *testing.T) {
out, err := cmd.CombinedOutput()
if err != nil {
t.Fatal(err, out)
t.Fatal(err, string(out))
}
if string(out) == "" {
@@ -538,7 +538,6 @@ func TestRunExecDir(t *testing.T) {
id := strings.TrimSpace(out)
execDir := filepath.Join(execDriverPath, id)
stateFile := filepath.Join(execDir, "state.json")
contFile := filepath.Join(execDir, "container.json")
{
fi, err := os.Stat(execDir)
@@ -552,10 +551,6 @@ func TestRunExecDir(t *testing.T) {
if err != nil {
t.Fatal(err)
}
fi, err = os.Stat(contFile)
if err != nil {
t.Fatal(err)
}
}
stopCmd := exec.Command(dockerBinary, "stop", id)
@@ -564,23 +559,12 @@ func TestRunExecDir(t *testing.T) {
t.Fatal(err, out)
}
{
fi, err := os.Stat(execDir)
if err != nil {
_, err := os.Stat(execDir)
if err == nil {
t.Fatal(err)
}
if !fi.IsDir() {
t.Fatalf("%q must be a directory", execDir)
}
fi, err = os.Stat(stateFile)
if err == nil {
t.Fatalf("Statefile %q is exists for stopped container!", stateFile)
}
if !os.IsNotExist(err) {
t.Fatalf("Error should be about non-existing, got %s", err)
}
fi, err = os.Stat(contFile)
if err == nil {
t.Fatalf("Container file %q is exists for stopped container!", contFile)
t.Fatalf("Exec directory %q exists for removed container!", execDir)
}
if !os.IsNotExist(err) {
t.Fatalf("Error should be about non-existing, got %s", err)
@@ -603,10 +587,6 @@ func TestRunExecDir(t *testing.T) {
if err != nil {
t.Fatal(err)
}
fi, err = os.Stat(contFile)
if err != nil {
t.Fatal(err)
}
}
rmCmd := exec.Command(dockerBinary, "rm", "-f", id)
out, _, err = runCommandWithOutput(rmCmd)