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

Merge pull request #1079 from crosbymichael/delete

Browse Source 
Add DeleteOpts for container deletion
This commit is contained in:
Michael Crosby
2017-06-23 15:25:36 -07:00
committed by GitHub
parent 6ad3ba739e 3f45e4369e
commit e69423f931
4 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
container_test.go
View File

@@ -109,7 +109,7 @@ func TestContainerStart(t *testing.T) {
t.Error(err)
return
}
defer container.Delete(ctx)
defer container.Delete(ctx, WithRootFSDeletion)
task, err := container.NewTask(ctx, Stdio)
if err != nil {
@@ -180,7 +180,7 @@ func TestContainerOutput(t *testing.T) {
t.Error(err)
return
}
defer container.Delete(ctx)
defer container.Delete(ctx, WithRootFSDeletion)
stdout := bytes.NewBuffer(nil)
task, err := container.NewTask(ctx, NewIO(bytes.NewBuffer(nil), stdout, bytes.NewBuffer(nil)))
@@ -252,7 +252,7 @@ func TestContainerExec(t *testing.T) {
t.Error(err)
return
}
defer container.Delete(ctx)
defer container.Delete(ctx, WithRootFSDeletion)
task, err := container.NewTask(ctx, empty())
if err != nil {
@@ -347,7 +347,7 @@ func TestContainerProcesses(t *testing.T) {
t.Error(err)
return
}
defer container.Delete(ctx)
defer container.Delete(ctx, WithRootFSDeletion)
task, err := container.NewTask(ctx, empty())
if err != nil {
@@ -420,7 +420,7 @@ func TestContainerCloseIO(t *testing.T) {
t.Error(err)
return
}
defer container.Delete(ctx)
defer container.Delete(ctx, WithRootFSDeletion)
const expected = "hello\n"
stdout := bytes.NewBuffer(nil)
@@ -504,7 +504,7 @@ func TestContainerAttach(t *testing.T) {
t.Error(err)
return
}
defer container.Delete(ctx)
defer container.Delete(ctx, WithRootFSDeletion)
expected := "hello\n"
stdout := bytes.NewBuffer(nil)
@@ -629,7 +629,7 @@ func TestDeleteRunningContainer(t *testing.T) {
t.Error(err)
return
}
defer container.Delete(ctx)
defer container.Delete(ctx, WithRootFSDeletion)
task, err := container.NewTask(ctx, empty())
if err != nil {
@@ -652,7 +652,7 @@ func TestDeleteRunningContainer(t *testing.T) {
return
}
err = container.Delete(ctx)
err = container.Delete(ctx, WithRootFSDeletion)
if err == nil {
t.Error("delete did not error with running task")
}