NotificationsYou must be signed in to change notification settings
Fork921
Star10.1k

Commitb9ac16c

authored

test(testutil): improve chan.go error visibility (#18406)

1 parentebc769f commitb9ac16cCopy full SHA for b9ac16c

File tree

1 file changed

+11

-8

lines changed

testutil
- chan.go

1 file changed

+11

-8

lines changed

`‎testutil/chan.go`

Lines changed: 11 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,9 @@ package testutil`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`	`"testing"`
	`6`	`+`
	`7`	`+"github.com/stretchr/testify/assert"`
	`8`	`+"github.com/stretchr/testify/require"`
`6`	`9`	`)`
`7`	`10`
`8`	`11`	`// TryReceive will attempt to receive a value from the chan and return it. If`
`@@ -14,7 +17,7 @@ func TryReceive[A any](ctx context.Context, t testing.TB, c <-chan A) A {`
`14`	`17`	`t.Helper()`
`15`	`18`	`select {`
`16`	`19`	`case<-ctx.Done():`
`17`		`-t.Fatal("timeout")`
	`20`	`+require.Fail(t,"TryReceive: context expired")`
`18`	`21`	`varaA`
`19`	`22`	`returna`
`20`	`23`	`casea:=<-c:`
`@@ -31,12 +34,12 @@ func RequireReceive[A any](ctx context.Context, t testing.TB, c <-chan A) A {`
`31`	`34`	`t.Helper()`
`32`	`35`	`select {`
`33`	`36`	`case<-ctx.Done():`
`34`		`-t.Fatal("timeout")`
	`37`	`+require.Fail(t,"RequireReceive: context expired")`
`35`	`38`	`varaA`
`36`	`39`	`returna`
`37`	`40`	`casea,ok:=<-c:`
`38`	`41`	`if!ok {`
`39`		`-t.Fatal("channel closed")`
	`42`	`+require.Fail(t,"RequireReceive:channel closed")`
`40`	`43`	`}`
`41`	`44`	`returna`
`42`	`45`	`}`
`@@ -50,7 +53,7 @@ func RequireSend[A any](ctx context.Context, t testing.TB, c chan<- A, a A) {`
`50`	`53`	`t.Helper()`
`51`	`54`	`select {`
`52`	`55`	`case<-ctx.Done():`
`53`		`-t.Fatal("timeout")`
	`56`	`+require.Fail(t,"RequireSend: context expired")`
`54`	`57`	`casec<-a:`
`55`	`58`	`// OK!`
`56`	`59`	`}`
`@@ -68,7 +71,7 @@ func SoftTryReceive[A any](ctx context.Context, t testing.TB, c <-chan A) (A, bo`
`68`	`71`	`t.Helper()`
`69`	`72`	`select {`
`70`	`73`	`case<-ctx.Done():`
`71`		`-t.Error("timeout")`
	`74`	`+assert.Fail(t,"SoftTryReceive: context expired")`
`72`	`75`	`varaA`
`73`	`76`	`returna,false`
`74`	`77`	`casea:=<-c:`
`@@ -86,12 +89,12 @@ func AssertReceive[A any](ctx context.Context, t testing.TB, c <-chan A) (A, boo`
`86`	`89`	`t.Helper()`
`87`	`90`	`select {`
`88`	`91`	`case<-ctx.Done():`
`89`		`-t.Error("timeout")`
	`92`	`+assert.Fail(t,"AssertReceive: context expired")`
`90`	`93`	`varaA`
`91`	`94`	`returna,false`
`92`	`95`	`casea,ok:=<-c:`
`93`	`96`	`if!ok {`
`94`		`-t.Error("channel closed")`
	`97`	`+assert.Fail(t,"AssertReceive:channel closed")`
`95`	`98`	`}`
`96`	`99`	`returna,ok`
`97`	`100`	`}`
`@@ -107,7 +110,7 @@ func AssertSend[A any](ctx context.Context, t testing.TB, c chan<- A, a A) bool`
`107`	`110`	`t.Helper()`
`108`	`111`	`select {`
`109`	`112`	`case<-ctx.Done():`
`110`		`-t.Error("timeout")`
	`113`	`+assert.Fail(t,"AssertSend: context expired")`
`111`	`114`	`returnfalse`
`112`	`115`	`casec<-a:`
`113`	`116`	`returntrue`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb9ac16c

File tree

1 file changed

1 file changed

`‎testutil/chan.go`

0 commit comments