test: retry talosctl time call in the tests

As `talosctl time` relies on default time server set in the config, and our nodes start with `pool.ntp.org`, sometimes request to the timeserver fails failing the tests. Retry such errors in the tests to avoid spurious failures. Signed-off-by: Andrey Smirnov <[email protected]>
siderolabs · Dec 17, 2021 · 17c1474 · 17c1474
1 parent acf1ac0
commit 17c1474
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 3 deletions.
diff --git a/internal/integration/base/run.go b/internal/integration/base/run.go
@@ -15,6 +15,7 @@ import (
 	"strings"
 
 	"github.com/stretchr/testify/suite"
+	"github.com/talos-systems/go-retry/retry"
 )
 
 // RunOption configures options for Run.
@@ -24,6 +25,7 @@ type RunOption func(*runOptions)
 type MatchFunc func(output string) error
 
 type runOptions struct {
+	retryer               retry.Retryer
 	shouldFail            bool
 	stdoutEmpty           bool
 	stderrNotEmpty        bool
@@ -35,6 +37,13 @@ type runOptions struct {
 	stderrMatchers        []MatchFunc
 }
 
+// WithRetry retries failing command runs.
+func WithRetry(retryer retry.Retryer) RunOption {
+	return func(opts *runOptions) {
+		opts.retryer = retryer
+	}
+}
+
 // ShouldFail tells run command should fail (with non-empty stderr).
 //
 // ShouldFail also sets StdErrNotEmpty.
@@ -141,6 +150,21 @@ func runAndWait(suite *suite.Suite, cmd *exec.Cmd) (stdoutBuf, stderrBuf *bytes.
 	return &stdout, &stderr, err
 }
 
+// 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) {
+	err = retryer.Retry(func() error {
+		stdoutBuf, stderrBuf, err = runAndWait(suite, cmd)
+
+		if _, ok := err.(*exec.ExitError); ok {
+			return retry.ExpectedError(err)
+		}
+
+		return err
+	})
+
+	return
+}
+
 // run executes command, asserts on its exit status/output, and returns stdout.
 //
 //nolint:gocyclo,nakedret
@@ -151,7 +175,17 @@ func run(suite *suite.Suite, cmd *exec.Cmd, options ...RunOption) (stdout string
 		o(&opts)
 	}
 
-	stdoutBuf, stderrBuf, err := runAndWait(suite, cmd)
+	var (
+		stdoutBuf, stderrBuf *bytes.Buffer
+		err                  error
+	)
+
+	if opts.retryer != nil {
+		stdoutBuf, stderrBuf, err = retryRunAndWait(suite, cmd, opts.retryer)
+	} else {
+		stdoutBuf, stderrBuf, err = runAndWait(suite, cmd)
+	}
+
 	if err != nil {
 		// check that command failed, not something else happened
 		_, ok := err.(*exec.ExitError)

diff --git a/internal/integration/cli/time.go b/internal/integration/cli/time.go
@@ -9,6 +9,9 @@ package cli
 
 import (
 	"regexp"
+	"time"
+
+	"github.com/talos-systems/go-retry/retry"
 
 	"github.com/talos-systems/talos/internal/integration/base"
 )
@@ -28,6 +31,7 @@ func (suite *TimeSuite) TestDefault() {
 	suite.RunCLI([]string{"time", "--nodes", suite.RandomDiscoveredNode()},
 		base.StdoutShouldMatch(regexp.MustCompile(`NTP-SERVER`)),
 		base.StdoutShouldMatch(regexp.MustCompile(`UTC`)),
+		base.WithRetry(retry.Constant(time.Minute, retry.WithUnits(time.Second))),
 	)
 }
 

diff --git a/internal/pkg/miniprocfs/testdata/1920080/exe b/internal/pkg/miniprocfs/testdata/1920080/exe
@@ -1 +1 @@
-/usr/bin/fish
+usr/bin/fish
diff --git a/internal/pkg/miniprocfs/testdata/3731034/exe b/internal/pkg/miniprocfs/testdata/3731034/exe
@@ -1 +1 @@
-/usr/bin/tail
+usr/bin/tail