Commita7bc37e

committed

fix: prevent data race

1 parent23356f6 commita7bc37eCopy full SHA for a7bc37e

File tree

+14

-6

lines changed

+14

-6

lines changed

Lines changed: 14 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,7 @@ type commandErrorCase struct {`
`24`	`24`	`funcTestErrorExamples(t*testing.T) {`
`25`	`25`	`t.Parallel()`
`26`	`26`
`27`		`-varroot cli.RootCmd`
`28`		`-rootCmd,err:=root.Command(root.AGPL())`
`29`		`-require.NoError(t,err)`
	`27`	`+rootCmd:=getRoot(t)`
`30`	`28`
`31`	`29`	`varcases []commandErrorCase`
`32`	`30`
`@@ -52,8 +50,7 @@ ExtractCommandPathsLoop:`
`52`	`50`
`53`	`51`	`varoutBuf bytes.Buffer`
`54`	`52`
`55`		`-rootCmd,err:=root.Command(root.AGPL())`
`56`		`-require.NoError(t,err)`
	`53`	`+rootCmd:=getRoot(t)`
`57`	`54`
`58`	`55`	`inv,_:=clitest.NewWithCommand(t,rootCmd,tt.Cmd...)`
`59`	`56`	`inv.Stderr=&outBuf`
`@@ -65,7 +62,7 @@ ExtractCommandPathsLoop:`
`65`	`62`	`inv.Stdin=os.Stdin`
`66`	`63`	`}`
`67`	`64`
`68`		`-err=inv.Run()`
	`65`	`+err:=inv.Run()`
`69`	`66`
`70`	`67`	`errFormatter:=cli.ExportNewPrettyErrorFormatter(&outBuf,false)`
`71`	`68`	`cli.ExportFormat(errFormatter,err)`
`@@ -84,3 +81,14 @@ func extractCommandPaths(cmdPath []string, cmds []*serpent.Command) [][]string {`
`84`	`81`	`}`
`85`	`82`	`returncmdPaths`
`86`	`83`	`}`
	`84`	`+`
	`85`	`+// Must return a fresh instance of cmds each time.`
	`86`	`+funcgetRoot(ttesting.T)serpent.Command {`
	`87`	`+t.Helper()`
	`88`	`+`
	`89`	`+varroot cli.RootCmd`
	`90`	`+rootCmd,err:=root.Command(root.AGPL())`
	`91`	`+require.NoError(t,err)`
	`92`	`+`
	`93`	`+returnrootCmd`
	`94`	`+}`

Comments

(0)