Commit6bfed73

committed

Clean up tests, amend PR comments

1 parent1640e3b commit6bfed73Copy full SHA for 6bfed73

File tree

+29

-25

lines changed

+29

-25

lines changed

Lines changed: 15 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,25 +25,27 @@ func TestTemplateCreate(t *testing.T) {`
`25`	`25`	`cmd,root:=clitest.New(t,"templates","create","my-template","--directory",source,"--test.provisioner",string(database.ProvisionerTypeEcho))`
`26`	`26`	`clitest.SetupConfig(t,client,root)`
`27`	`27`	`_=coderdtest.NewProvisionerDaemon(t,client)`
`28`		`-doneChan:=make(chanstruct{})`
`29`	`28`	`pty:=ptytest.New(t)`
`30`	`29`	`cmd.SetIn(pty.Input())`
`31`	`30`	`cmd.SetOut(pty.Output())`
	`31`	`+`
	`32`	`+execDone:=make(chanerror)`
`32`	`33`	`gofunc() {`
`33`		`-deferclose(doneChan)`
`34`		`-err:=cmd.Execute()`
`35`		`-require.NoError(t,err)`
	`34`	`+execDone<-cmd.Execute()`
`36`	`35`	`}()`
`37`		`-matches:= []string{`
`38`		`-"Create and upload","yes",`
`39`		`-"Confirm create?","yes",`
	`36`	`+`
	`37`	`+matches:= []struct {`
	`38`	`+matchstring`
	`39`	`+writestring`
	`40`	`+}{`
	`41`	`+{match:"Create and upload",write:"yes"},`
	`42`	`+{match:"Confirm create?",write:"yes"},`
`40`	`43`	`}`
`41`		`-fori:=0;i<len(matches);i+=2 {`
`42`		`-match:=matches[i]`
`43`		`-value:=matches[i+1]`
`44`		`-pty.ExpectMatch(match)`
`45`		`-pty.WriteLine(value)`
	`44`	`+for_,m:=rangematches {`
	`45`	`+pty.ExpectMatch(m.match)`
	`46`	`+pty.WriteLine(m.write)`
`46`	`47`	`}`
`47`		`-<-doneChan`
	`48`	`+`
	`49`	`+require.NoError(t,<-execDone)`
`48`	`50`	`})`
`49`	`51`	`}`

Lines changed: 14 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,22 +35,24 @@ func TestTemplateUpdate(t *testing.T) {`
`35`	`35`	`pty:=ptytest.New(t)`
`36`	`36`	`cmd.SetIn(pty.Input())`
`37`	`37`	`cmd.SetOut(pty.Output())`
`38`		`-done:=make(chanstruct{})`
	`38`	`+`
	`39`	`+execDone:=make(chanerror)`
`39`	`40`	`gofunc() {`
`40`		`-deferclose(done)`
`41`		`-err:=cmd.Execute()`
`42`		`-require.NoError(t,err)`
	`41`	`+execDone<-cmd.Execute()`
`43`	`42`	`}()`
`44`		`-matches:= []string{`
`45`		`-"Upload","yes",`
	`43`	`+`
	`44`	`+matches:= []struct {`
	`45`	`+matchstring`
	`46`	`+writestring`
	`47`	`+}{`
	`48`	`+{match:"Upload",write:"yes"},`
`46`	`49`	`}`
`47`		`-fori:=0;i<len(matches);i+=2 {`
`48`		`-match:=matches[i]`
`49`		`-value:=matches[i+1]`
`50`		`-pty.ExpectMatch(match)`
`51`		`-pty.WriteLine(value)`
	`50`	`+for_,m:=rangematches {`
	`51`	`+pty.ExpectMatch(m.match)`
	`52`	`+pty.WriteLine(m.write)`
`52`	`53`	`}`
`53`		`-<-done`
	`54`	`+`
	`55`	`+require.NoError(t,<-execDone)`
`54`	`56`
`55`	`57`	`// Assert that the template version changed.`
`56`	`58`	`templateVersions,err:=client.TemplateVersionsByTemplate(context.Background(), codersdk.TemplateVersionsByTemplateRequest{`

Comments

(0)