test: attempt number on two on proper retries in CLI time tests

See #4702 Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com> (cherry picked from commit c297d66)
siderolabs · Jan 21, 2022 · ba39f68 · ba39f68
1 parent c1c5d9e
commit ba39f68
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/internal/integration/base/cli.go b/internal/integration/base/cli.go
@@ -106,7 +106,7 @@ func (cliSuite *CLISuite) buildCLICmd(args []string) *exec.Cmd {
 
 // RunCLI runs talosctl binary with the options provided.
 func (cliSuite *CLISuite) RunCLI(args []string, options ...RunOption) (stdout string) {
-	return run(&cliSuite.Suite, cliSuite.buildCLICmd(args), options...)
+	return run(&cliSuite.Suite, func() *exec.Cmd { return cliSuite.buildCLICmd(args) }, options...)
 }
 
 // RunAndWaitForMatch retries command until output matches.

diff --git a/internal/integration/base/run.go b/internal/integration/base/run.go
@@ -151,9 +151,9 @@ func runAndWait(suite *suite.Suite, cmd *exec.Cmd) (stdoutBuf, stderrBuf *bytes.
 }
 
 // retryRunAndWait retries runAndWait if the command fails to run.
-func retryRunAndWait(suite *suite.Suite, cmd *exec.Cmd, retryer retry.Retryer) (stdoutBuf, stderrBuf *bytes.Buffer, err error) {
+func retryRunAndWait(suite *suite.Suite, cmdFunc func() *exec.Cmd, retryer retry.Retryer) (stdoutBuf, stderrBuf *bytes.Buffer, err error) {
 	err = retryer.Retry(func() error {
-		stdoutBuf, stderrBuf, err = runAndWait(suite, cmd)
+		stdoutBuf, stderrBuf, err = runAndWait(suite, cmdFunc())
 
 		if _, ok := err.(*exec.ExitError); ok {
 			return retry.ExpectedError(err)
@@ -168,7 +168,7 @@ func retryRunAndWait(suite *suite.Suite, cmd *exec.Cmd, retryer retry.Retryer) (
 // run executes command, asserts on its exit status/output, and returns stdout.
 //
 //nolint:gocyclo,nakedret
-func run(suite *suite.Suite, cmd *exec.Cmd, options ...RunOption) (stdout string) {
+func run(suite *suite.Suite, cmdFunc func() *exec.Cmd, options ...RunOption) (stdout string) {
 	var opts runOptions
 
 	for _, o := range options {
@@ -181,9 +181,9 @@ func run(suite *suite.Suite, cmd *exec.Cmd, options ...RunOption) (stdout string
 	)
 
 	if opts.retryer != nil {
-		stdoutBuf, stderrBuf, err = retryRunAndWait(suite, cmd, opts.retryer)
+		stdoutBuf, stderrBuf, err = retryRunAndWait(suite, cmdFunc, opts.retryer)
 	} else {
-		stdoutBuf, stderrBuf, err = runAndWait(suite, cmd)
+		stdoutBuf, stderrBuf, err = runAndWait(suite, cmdFunc())
 	}
 
 	if err != nil {