Fix flaky ListCommand integration test

ehl-jf · ehl-jf · commit 3311ab139539 · 2025-03-28T14:48:20.000+01:00
diff --git a/qa-plugin/go.mod b/qa-plugin/go.mod
@@ -28,7 +28,7 @@ require (
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.6.0 // indirect
 	github.com/go-git/go-git/v5 v5.13.0 // indirect
-	github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
+	github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/uuid v1.6.0 // indirect
@@ -83,7 +83,7 @@ require (
 	golang.org/x/crypto v0.35.0 // indirect
 	golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
 	golang.org/x/mod v0.22.0 // indirect
-	golang.org/x/net v0.33.0 // indirect
+	golang.org/x/net v0.36.0 // indirect
 	golang.org/x/sync v0.11.0 // indirect
 	golang.org/x/sys v0.30.0 // indirect
 	golang.org/x/term v0.29.0 // indirect
diff --git a/qa-plugin/go.sum b/qa-plugin/go.sum
@@ -69,6 +69,7 @@ github.com/go-git/go-git/v5 v5.13.0 h1:vLn5wlGIh/X78El6r3Jr+30W16Blk0CTcxTYcYPWi
 github.com/go-git/go-git/v5 v5.13.0/go.mod h1:Wjo7/JyVKtQgUNdXYXIepzWfJQkUEIGvkvVkiXRR/zw=
 github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
 github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
@@ -235,6 +236,7 @@ golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
 golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
 golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
diff --git a/test/commands/show_execution_history_test.go b/test/commands/show_execution_history_test.go
@@ -67,7 +67,7 @@ func TestShowExecutionHistory(t *testing.T) {
 
 				for _, tt := range tests {
 					it.Run(tt.name, func(t *infra.Test) {
-						it.ResetOutput()
+						it.ResetIO()
 						tt.test(t, workerKey)
 					})
 				}
diff --git a/test/infra/itest_runner.go b/test/infra/itest_runner.go
@@ -42,7 +42,9 @@ type Test struct {
 	AccessToken string
 	dataDir     string
 	platformUrl string
-	output      *bytes.Buffer
+	input       string
+	stdout      *bytes.Buffer
+	stdin       *bytes.Reader
 	t           *testing.T
 }
 
@@ -124,10 +126,12 @@ func runTest(t *testing.T, testSpec TestDefinition) {
 		AccessToken: accessToken,
 		dataDir:     homeDir,
 		platformUrl: platformUrl,
+		input:       testSpec.Input,
 	}
 
 	if testSpec.Input != "" {
-		common.SetCliIn(bytes.NewReader([]byte(testSpec.Input)))
+		it.stdin = bytes.NewReader([]byte(testSpec.Input))
+		common.SetCliIn(it.stdin)
 		t.Cleanup(func() {
 			common.SetCliIn(os.Stdin)
 		})
@@ -139,7 +143,7 @@ func runTest(t *testing.T, testSpec TestDefinition) {
 		t.Cleanup(func() {
 			common.SetCliOut(os.Stdout)
 		})
-		it.output = &newOutput
+		it.stdout = &newOutput
 	}
 
 	testSpec.Test(it)
@@ -187,6 +191,7 @@ func (it *Test) RetryCommand(args []string, backoff time.Duration, timeout time.
 
 	for shouldRetryCommandOnError(err, onErrorContaining) && elapsed < timeout {
 		time.Sleep(waitDuration)
+		it.ResetIO()
 		err = runPlugin()
 		elapsed = time.Since(start)
 	}
@@ -209,8 +214,8 @@ func shouldRetryCommandOnError(err error, onErrorContaining []string) bool {
 }
 
 func (it *Test) CapturedOutput() []byte {
-	if it.output != nil {
-		return it.output.Bytes()
+	if it.stdout != nil {
+		return it.stdout.Bytes()
 	}
 	return nil
 }
@@ -271,9 +276,12 @@ func (it *Test) DeleteWorker(workerKey string) {
 	}
 }
 
-func (it *Test) ResetOutput() {
-	if it.output != nil {
-		it.output.Reset()
+func (it *Test) ResetIO() {
+	if it.stdin != nil {
+		it.stdin.Reset([]byte(it.input))
+	}
+	if it.stdout != nil {
+		it.stdout.Reset()
 	}
 }
 
@@ -347,7 +355,7 @@ func (it *Test) Helper() {
 
 func (it *Test) Run(name string, f func(t *Test)) bool {
 	return it.t.Run(name, func(t *testing.T) {
-		f(&Test{t: t, ServerId: it.ServerId, AccessToken: it.AccessToken, dataDir: it.dataDir, output: it.output})
+		f(&Test{t: t, ServerId: it.ServerId, AccessToken: it.AccessToken, dataDir: it.dataDir, stdout: it.stdout, stdin: it.stdin, input: it.input})
 	})
 }
 

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ func TestShowExecutionHistory(t *testing.T) {`
`67`	`67`
`68`	`68`	`for _, tt := range tests {`
`69`	`69`	`it.Run(tt.name, func(t *infra.Test) {`
`70`		`- it.ResetOutput()`
	`70`	`+ it.ResetIO()`
`71`	`71`	`tt.test(t, workerKey)`
`72`	`72`	`})`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,9 @@ type Test struct {`
`42`	`42`	`AccessToken string`
`43`	`43`	`dataDir string`
`44`	`44`	`platformUrl string`
`45`		`- output *bytes.Buffer`
	`45`	`+ input string`
	`46`	`+ stdout *bytes.Buffer`
	`47`	`+ stdin *bytes.Reader`
`46`	`48`	`t *testing.T`
`47`	`49`	`}`
`48`	`50`
`@@ -124,10 +126,12 @@ func runTest(t *testing.T, testSpec TestDefinition) {`
`124`	`126`	`AccessToken: accessToken,`
`125`	`127`	`dataDir: homeDir,`
`126`	`128`	`platformUrl: platformUrl,`
	`129`	`+ input: testSpec.Input,`
`127`	`130`	`}`
`128`	`131`
`129`	`132`	`if testSpec.Input != "" {`
`130`		`- common.SetCliIn(bytes.NewReader([]byte(testSpec.Input)))`
	`133`	`+ it.stdin = bytes.NewReader([]byte(testSpec.Input))`
	`134`	`+ common.SetCliIn(it.stdin)`
`131`	`135`	`t.Cleanup(func() {`
`132`	`136`	`common.SetCliIn(os.Stdin)`
`133`	`137`	`})`
`@@ -139,7 +143,7 @@ func runTest(t *testing.T, testSpec TestDefinition) {`
`139`	`143`	`t.Cleanup(func() {`
`140`	`144`	`common.SetCliOut(os.Stdout)`
`141`	`145`	`})`
`142`		`- it.output = &newOutput`
	`146`	`+ it.stdout = &newOutput`
`143`	`147`	`}`
`144`	`148`
`145`	`149`	`testSpec.Test(it)`
`@@ -187,6 +191,7 @@ func (it *Test) RetryCommand(args []string, backoff time.Duration, timeout time.`
`187`	`191`
`188`	`192`	`for shouldRetryCommandOnError(err, onErrorContaining) && elapsed < timeout {`
`189`	`193`	`time.Sleep(waitDuration)`
	`194`	`+ it.ResetIO()`
`190`	`195`	`err = runPlugin()`
`191`	`196`	`elapsed = time.Since(start)`
`192`	`197`	`}`
`@@ -209,8 +214,8 @@ func shouldRetryCommandOnError(err error, onErrorContaining []string) bool {`
`209`	`214`	`}`
`210`	`215`
`211`	`216`	`func (it *Test) CapturedOutput() []byte {`
`212`		`- if it.output != nil {`
`213`		`- return it.output.Bytes()`
	`217`	`+ if it.stdout != nil {`
	`218`	`+ return it.stdout.Bytes()`
`214`	`219`	`}`
`215`	`220`	`return nil`
`216`	`221`	`}`
`@@ -271,9 +276,12 @@ func (it *Test) DeleteWorker(workerKey string) {`
`271`	`276`	`}`
`272`	`277`	`}`
`273`	`278`
`274`		`-func (it *Test) ResetOutput() {`
`275`		`- if it.output != nil {`
`276`		`- it.output.Reset()`
	`279`	`+func (it *Test) ResetIO() {`
	`280`	`+ if it.stdin != nil {`
	`281`	`+ it.stdin.Reset([]byte(it.input))`
	`282`	`+ }`
	`283`	`+ if it.stdout != nil {`
	`284`	`+ it.stdout.Reset()`
`277`	`285`	`}`
`278`	`286`	`}`
`279`	`287`
`@@ -347,7 +355,7 @@ func (it *Test) Helper() {`
`347`	`355`
`348`	`356`	`func (it Test) Run(name string, f func(t Test)) bool {`
`349`	`357`	`return it.t.Run(name, func(t *testing.T) {`
`350`		`- f(&Test{t: t, ServerId: it.ServerId, AccessToken: it.AccessToken, dataDir: it.dataDir, output: it.output})`
	`358`	`+ f(&Test{t: t, ServerId: it.ServerId, AccessToken: it.AccessToken, dataDir: it.dataDir, stdout: it.stdout, stdin: it.stdin, input: it.input})`
`351`	`359`	`})`
`352`	`360`	`}`
`353`	`361`