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

integration/client: Rework withBytesBuffers

Browse Source 
All of the tests using this didn't need stdin/err (one of them not even
stdout), so we can just leave them "empty" and change to a withStdout
naming to make it more obvious.

Signed-off-by: Danny Canter <danny@dcantah.dev>
This commit is contained in:
Danny Canter 2023-06-27 22:46:40 -07:00
parent 9b4ed8acc2
commit e85352183e
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integration/client/container_checkpoint_test.go
View File

@ -488,7 +488,7 @@ func TestCheckpointRestoreWithImagePath(t *testing.T) {
stdout := bytes.NewBuffer(nil) stdout := bytes.NewBuffer(nil)
spec.Process.Args = []string{"ps", "-ef"} spec.Process.Args = []string{"ps", "-ef"}
process, err := ntask.Exec(ctx, t.Name()+"_exec", spec.Process, cio.NewCreator(withByteBuffers(stdout))) process, err := ntask.Exec(ctx, t.Name()+"_exec", spec.Process, cio.NewCreator(withStdout(stdout)))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

3
integration/client/container_linux_test.go
View File

@ -897,8 +897,7 @@ func TestContainerKillAll(t *testing.T) {
} }
defer container.Delete(ctx, WithSnapshotCleanup) defer container.Delete(ctx, WithSnapshotCleanup)
stdout := bytes.NewBuffer(nil) task, err := container.NewTask(ctx, cio.NullIO)
task, err := container.NewTask(ctx, cio.NewCreator(withByteBuffers(stdout)))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

20
integration/client/container_test.go
View File

@ -323,7 +323,7 @@ func TestContainerOutput(t *testing.T) {
defer container.Delete(ctx, WithSnapshotCleanup) defer container.Delete(ctx, WithSnapshotCleanup)
stdout := bytes.NewBuffer(nil) stdout := bytes.NewBuffer(nil)
task, err := container.NewTask(ctx, cio.NewCreator(withByteBuffers(stdout))) task, err := container.NewTask(ctx, cio.NewCreator(withStdout(stdout)))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -355,12 +355,11 @@ func TestContainerOutput(t *testing.T) {
} }
} }
func withByteBuffers(stdout io.Writer) cio.Opt { func withStdout(stdout io.Writer) cio.Opt {
// TODO: could this use io.Discard?
return func(streams *cio.Streams) { return func(streams *cio.Streams) {
streams.Stdin = new(bytes.Buffer) streams.Stdin = bytes.NewReader(nil)
streams.Stdout = stdout streams.Stdout = stdout
streams.Stderr = new(bytes.Buffer) streams.Stderr = io.Discard
} }
} }
@ -1259,7 +1258,7 @@ func TestContainerHostname(t *testing.T) {
defer container.Delete(ctx, WithSnapshotCleanup) defer container.Delete(ctx, WithSnapshotCleanup)
stdout := bytes.NewBuffer(nil) stdout := bytes.NewBuffer(nil)
task, err := container.NewTask(ctx, cio.NewCreator(withByteBuffers(stdout))) task, err := container.NewTask(ctx, cio.NewCreator(withStdout(stdout)))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -1864,7 +1863,7 @@ func TestContainerExecLargeOutputWithTTY(t *testing.T) {
stdout := bytes.NewBuffer(nil) stdout := bytes.NewBuffer(nil)
execID := t.Name() + "_exec" execID := t.Name() + "_exec"
process, err := task.Exec(ctx, execID, processSpec, cio.NewCreator(withByteBuffers(stdout), withProcessTTY())) process, err := task.Exec(ctx, execID, processSpec, cio.NewCreator(withStdout(stdout), withProcessTTY()))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -2273,8 +2272,7 @@ func initContainerAndCheckChildrenDieOnKill(t *testing.T, opts ...oci.SpecOpts)
} }
defer container.Delete(ctx, WithSnapshotCleanup) defer container.Delete(ctx, WithSnapshotCleanup)
stdout := bytes.NewBuffer(nil) task, err := container.NewTask(ctx, cio.NullIO)
task, err := container.NewTask(ctx, cio.NewCreator(withByteBuffers(stdout)))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -2618,7 +2616,7 @@ func TestContainerUsername(t *testing.T) {
defer container.Delete(ctx, WithSnapshotCleanup) defer container.Delete(ctx, WithSnapshotCleanup)
buf := bytes.NewBuffer(nil) buf := bytes.NewBuffer(nil)
task, err := container.NewTask(ctx, cio.NewCreator(withByteBuffers(buf))) task, err := container.NewTask(ctx, cio.NewCreator(withStdout(buf)))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -2670,7 +2668,7 @@ func TestContainerPTY(t *testing.T) {
defer container.Delete(ctx, WithSnapshotCleanup) defer container.Delete(ctx, WithSnapshotCleanup)
buf := bytes.NewBuffer(nil) buf := bytes.NewBuffer(nil)
task, err := container.NewTask(ctx, cio.NewCreator(withByteBuffers(buf), withProcessTTY())) task, err := container.NewTask(ctx, cio.NewCreator(withStdout(buf), withProcessTTY()))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }