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

Return fifo paths from Shim

Browse Source 
This allows attach of existing fifos to be done without any information
stored on the client side.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2017-06-01 13:36:44 -07:00
parent 43fb19e01c
commit 00734ab04a
16 changed files with 682 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
container_test.go
View File

@@ -502,13 +502,7 @@ func TestContainerAttach(t *testing.T) {
wg.Done()
}()
// TODO: return fifo information from shim based on task/process
dir, err := ioutil.TempDir("", "attach")
if err != nil {
t.Error(err)
return
}
task, err := container.NewTask(ctx, WithIO(r, ow, ioutil.Discard, dir))
task, err := container.NewTask(ctx, NewIO(r, ow, ioutil.Discard))
if err != nil {
t.Error(err)
return
@@ -546,7 +540,7 @@ func TestContainerAttach(t *testing.T) {
t.Error(err)
return
}
if task, err = container.LoadTask(ctx, WithIO(r, ow, ioutil.Discard, dir)); err != nil {
if task, err = container.LoadTask(ctx, WithAttach(r, ow, ioutil.Discard)); err != nil {
t.Error(err)
return
}