kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #2747 from jpoimboe/test-fixes

Browse source 
Test fixes
This commit is contained in:
Victor Vieux 2013-11-20 10:07:40 -08:00
commit 304a80fcd5
3 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
integration/commands_test.go
View file

@ -329,7 +329,7 @@ func TestRunDisconnectTty(t *testing.T) {
// Client disconnect after run -i should keep stdin out in TTY mode // Client disconnect after run -i should keep stdin out in TTY mode
container := globalRuntime.List()[0] container := globalRuntime.List()[0]
setTimeout(t, "Read/Write assertion timed out", 2000*time.Second, func() { setTimeout(t, "Read/Write assertion timed out", 2*time.Second, func() {
if err := assertPipe("hello\n", "hello", stdout, stdinPipe, 15); err != nil { if err := assertPipe("hello\n", "hello", stdout, stdinPipe, 15); err != nil {
t.Fatal(err) t.Fatal(err)
} }

9
integration/container_test.go
View file

@ -330,6 +330,11 @@ func TestCommitRun(t *testing.T) {
} }
func TestStart(t *testing.T) { func TestStart(t *testing.T) {
_, err1 := os.Stat("/sys/fs/cgroup/cpuacct,cpu")
_, err2 := os.Stat("/sys/fs/cgroup/cpu,cpuacct")
if err1 == nil || err2 == nil {
t.Skip("Fixme. Setting cpu cgroup shares doesn't work in dind on a Fedora host. The lxc utils are confused by the cpu,cpuacct mount.")
}
runtime := mkRuntime(t) runtime := mkRuntime(t)
defer nuke(runtime) defer nuke(runtime)
container, _, _ := mkContainer(runtime, []string{"-m", "33554432", "-c", "1000", "-i", "_", "/bin/cat"}, t) container, _, _ := mkContainer(runtime, []string{"-m", "33554432", "-c", "1000", "-i", "_", "/bin/cat"}, t)
@ -563,7 +568,7 @@ func TestExitCode(t *testing.T) {
trueContainer, _, err := runtime.Create(&docker.Config{ trueContainer, _, err := runtime.Create(&docker.Config{
Image: GetTestImage(runtime).ID, Image: GetTestImage(runtime).ID,
Cmd: []string{"/bin/true", ""}, Cmd: []string{"/bin/true"},
}, "") }, "")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -578,7 +583,7 @@ func TestExitCode(t *testing.T) {
falseContainer, _, err := runtime.Create(&docker.Config{ falseContainer, _, err := runtime.Create(&docker.Config{
Image: GetTestImage(runtime).ID, Image: GetTestImage(runtime).ID,
Cmd: []string{"/bin/false", ""}, Cmd: []string{"/bin/false"},
}, "") }, "")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)

14
integration/server_test.go
View file

@ -109,7 +109,7 @@ func TestCreateRmVolumes(t *testing.T) {
srv := mkServerFromEngine(eng, t) srv := mkServerFromEngine(eng, t)
defer mkRuntimeFromEngine(eng, t).Nuke() defer mkRuntimeFromEngine(eng, t).Nuke()
config, hostConfig, _, err := docker.ParseRun([]string{"-v", "/srv", unitTestImageID, "echo test"}, nil) config, hostConfig, _, err := docker.ParseRun([]string{"-v", "/srv", unitTestImageID, "echo", "test"}, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -164,7 +164,7 @@ func TestCreateStartRestartStopStartKillRm(t *testing.T) {
srv := mkServerFromEngine(eng, t) srv := mkServerFromEngine(eng, t)
defer mkRuntimeFromEngine(eng, t).Nuke() defer mkRuntimeFromEngine(eng, t).Nuke()
config, hostConfig, _, err := docker.ParseRun([]string{unitTestImageID, "/bin/cat"}, nil) config, hostConfig, _, err := docker.ParseRun([]string{"-i", unitTestImageID, "/bin/cat"}, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -240,7 +240,7 @@ func TestRmi(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
config, hostConfig, _, err := docker.ParseRun([]string{unitTestImageID, "echo test"}, nil) config, hostConfig, _, err := docker.ParseRun([]string{unitTestImageID, "echo", "test"}, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -256,6 +256,10 @@ func TestRmi(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if _, err := srv.ContainerWait(containerID); err != nil {
t.Fatal(err)
}
imageID, err := srv.ContainerCommit(containerID, "test", "", "", "", nil) imageID, err := srv.ContainerCommit(containerID, "test", "", "", "", nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -277,6 +281,10 @@ func TestRmi(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if _, err := srv.ContainerWait(containerID); err != nil {
t.Fatal(err)
}
_, err = srv.ContainerCommit(containerID, "test", "", "", "", nil) _, err = srv.ContainerCommit(containerID, "test", "", "", "", nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)