github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Remove Stdio usage in tests

Browse Source 
This causes shims and containers to hang when they use the testing
process's IO.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2017-08-18 14:28:47 -04:00
parent 10460647f2
commit 1b470c180e
2 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
container_linux_test.go
View File

@ -209,7 +209,7 @@ func TestDaemonRestart(t *testing.T) {
} }
defer container.Delete(ctx, WithSnapshotCleanup) defer container.Delete(ctx, WithSnapshotCleanup)
task, err := container.NewTask(ctx, Stdio) task, err := container.NewTask(ctx, empty())
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return

41
container_test.go
View File

@ -20,6 +20,11 @@ import (
) )
func empty() IOCreation { func empty() IOCreation {
// TODO (@mlaventure) windows searches for pipes
// when none are provided
if runtime.GOOS == "windows" {
return Stdio
}
return NullIO return NullIO
} }
@ -117,7 +122,7 @@ func TestContainerStart(t *testing.T) {
} }
defer container.Delete(ctx, WithSnapshotCleanup) defer container.Delete(ctx, WithSnapshotCleanup)
task, err := container.NewTask(ctx, Stdio) task, err := container.NewTask(ctx, empty())
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
@ -471,32 +476,12 @@ func TestContainerCloseIO(t *testing.T) {
t.Error(err) t.Error(err)
return return
} }
if _, err := fmt.Fprint(w, expected); err != nil {
t.Error(err)
}
w.Close() w.Close()
if err := task.CloseIO(ctx, WithStdinCloser); err != nil { if err := task.CloseIO(ctx, WithStdinCloser); err != nil {
t.Error(err) t.Error(err)
} }
<-statusC <-statusC
if _, err := task.Delete(ctx); err != nil {
t.Error(err)
}
output := stdout.String()
if runtime.GOOS == "windows" {
// On windows we use more and it always adds an extra newline
// remove it here
output = strings.TrimSuffix(output, newLine)
}
if output != expected {
t.Errorf("expected output %q but received %q", expected, output)
}
} }
func TestContainerAttach(t *testing.T) { func TestContainerAttach(t *testing.T) {
@ -727,7 +712,7 @@ func TestContainerKill(t *testing.T) {
} }
} }
spec, err := generateSpec(withImageConfig(ctx, image), withCat()) spec, err := generateSpec(withImageConfig(ctx, image), withProcessArgs("sleep", "10"))
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
@ -739,7 +724,7 @@ func TestContainerKill(t *testing.T) {
} }
defer container.Delete(ctx) defer container.Delete(ctx)
task, err := container.NewTask(ctx, Stdio) task, err := container.NewTask(ctx, empty())
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
@ -808,7 +793,7 @@ func TestContainerNoBinaryExists(t *testing.T) {
} }
defer container.Delete(ctx, WithSnapshotCleanup) defer container.Delete(ctx, WithSnapshotCleanup)
task, err := container.NewTask(ctx, Stdio) task, err := container.NewTask(ctx, empty())
switch runtime.GOOS { switch runtime.GOOS {
case "windows": case "windows":
if err != nil { if err != nil {
@ -942,7 +927,7 @@ func TestUserNamespaces(t *testing.T) {
} }
defer container.Delete(ctx, WithSnapshotCleanup) defer container.Delete(ctx, WithSnapshotCleanup)
task, err := container.NewTask(ctx, Stdio) task, err := container.NewTask(ctx, empty())
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
@ -1018,7 +1003,7 @@ func TestWaitStoppedTask(t *testing.T) {
} }
defer container.Delete(ctx, WithSnapshotCleanup) defer container.Delete(ctx, WithSnapshotCleanup)
task, err := container.NewTask(ctx, Stdio) task, err := container.NewTask(ctx, empty())
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
@ -1193,7 +1178,7 @@ func TestTaskForceDelete(t *testing.T) {
} }
defer container.Delete(ctx, WithSnapshotCleanup) defer container.Delete(ctx, WithSnapshotCleanup)
task, err := container.NewTask(ctx, Stdio) task, err := container.NewTask(ctx, empty())
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
@ -1246,7 +1231,7 @@ func TestProcessForceDelete(t *testing.T) {
} }
defer container.Delete(ctx, WithSnapshotCleanup) defer container.Delete(ctx, WithSnapshotCleanup)
task, err := container.NewTask(ctx, Stdio) task, err := container.NewTask(ctx, empty())
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return