Merge pull request moby#3952 from tonistiigi/test-rm-fix

tonistiigi · web-flow · commit cb86cc619256 · 2023-06-15T17:35:15.000-07:00
integration: fix not deleting dockerd workdir
diff --git a/util/testutil/integration/dockerd.go b/util/testutil/integration/dockerd.go
@@ -123,6 +123,9 @@ func (c Moby) New(ctx context.Context, cfg *BackendConfig) (b Backend, cl func()
 	if err != nil {
 		return nil, nil, err
 	}
+	deferF.append(func() error {
+		return os.RemoveAll(workDir)
+	})
 
 	d, err := dockerd.NewDaemon(workDir)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,9 @@ func (c Moby) New(ctx context.Context, cfg *BackendConfig) (b Backend, cl func()`
`123`	`123`	`if err != nil {`
`124`	`124`	`return nil, nil, err`
`125`	`125`	`}`
	`126`	`+ deferF.append(func() error {`
	`127`	`+ return os.RemoveAll(workDir)`
	`128`	`+ })`
`126`	`129`
`127`	`130`	`d, err := dockerd.NewDaemon(workDir)`
`128`	`131`	`if err != nil {`