Commit0e4d689

authored

test: fix cleanup order on provisioner daemon work dir (#9668)

* test: fix cleanup order on provisioner daemon work dir* Reduce the test race condition

1 parent53a985f commit0e4d689Copy full SHA for 0e4d689

File tree

+16

-2

lines changed

+16

-2

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -459,15 +459,20 @@ func NewWithAPI(t testing.TB, options Options) (codersdk.Client, io.Closer, *c`
`459`	`459`	`funcNewProvisionerDaemon(t testing.TB,coderAPI*coderd.API) io.Closer {`
`460`	`460`	`t.Helper()`
`461`	`461`
	`462`	`+// t.Cleanup runs in last added, first called order. t.TempDir() will delete`
	`463`	`+// the directory on cleanup, so we want to make sure the echoServer is closed`
	`464`	`+// before we go ahead an attempt to delete it's work directory.`
	`465`	`+// seems t.TempDir() is not safe to call from a different goroutine`
	`466`	`+workDir:=t.TempDir()`
	`467`	`+`
`462`	`468`	`echoClient,echoServer:=provisionersdk.MemTransportPipe()`
`463`	`469`	`ctx,cancelFunc:=context.WithCancel(context.Background())`
`464`	`470`	`t.Cleanup(func() {`
`465`	`471`	`_=echoClient.Close()`
`466`	`472`	`_=echoServer.Close()`
`467`	`473`	`cancelFunc()`
`468`	`474`	`})`
`469`		`-// seems t.TempDir() is not safe to call from a different goroutine`
`470`		`-workDir:=t.TempDir()`
	`475`	`+`
`471`	`476`	`gofunc() {`
`472`	`477`	`err:=echo.Serve(ctx,&provisionersdk.ServeOptions{`
`473`	`478`	`Listener:echoServer,`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -230,6 +230,15 @@ func (s *Session) extractArchive() error {`
`230`	`230`	`ifmode==0 {`
`231`	`231`	`mode=0o600`
`232`	`232`	`}`
	`233`	`+`
	`234`	`+// Always check for context cancellation before reading the next header.`
	`235`	`+// This is mainly important for unit tests, since a canceled context means`
	`236`	`+// the underlying directory is going to be deleted. There still exists`
	`237`	`+// the small race condition that the context is cancelled after this, and`
	`238`	`+// before the disk write.`
	`239`	`+ifctx.Err()!=nil {`
	`240`	`+returnxerrors.Errorf("context canceled: %w",ctx.Err())`
	`241`	`+}`
`233`	`242`	`switchheader.Typeflag {`
`234`	`243`	`casetar.TypeDir:`
`235`	`244`	`err=os.MkdirAll(headerPath,mode)`

Comments

(0)