From 42980d609bc20c2790567296cab5a861055d2e33 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Tue, 24 Mar 2020 06:29:35 -0700 Subject: [PATCH] remove not needed retry --- test/integration/functional_test.go | 2 +- test/integration/version_upgrade_test.go | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go index fc53eea6c0..5111590fe6 100644 --- a/test/integration/functional_test.go +++ b/test/integration/functional_test.go @@ -725,7 +725,7 @@ func validateMySQL(ctx context.Context, t *testing.T, profile string) { rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "exec", names[0], "--", "mysql", "-ppassword", "-e", "show databases;")) return err } - if err = retry.Expo(mysql, 5*time.Second, Seconds(180)); err != nil { + if err = retry.Expo(mysql, 2*time.Second, Seconds(180)); err != nil { t.Errorf("mysql failing: %v", err) } } diff --git a/test/integration/version_upgrade_test.go b/test/integration/version_upgrade_test.go index e9c655a9b4..0c553b9998 100644 --- a/test/integration/version_upgrade_test.go +++ b/test/integration/version_upgrade_test.go @@ -76,7 +76,7 @@ func TestVersionUpgrade(t *testing.T) { } // Retry to allow flakiness for the previous release - if err := retry.Expo(r, 1*time.Second, Minutes(30), 3); err != nil { + if err := retry.Expo(r, 1*time.Second, Minutes(30), 2); err != nil { t.Fatalf("release start failed: %v", err) } @@ -120,14 +120,8 @@ func TestVersionUpgrade(t *testing.T) { } args = append([]string{"start", "-p", profile, fmt.Sprintf("--kubernetes-version=%s", constants.OldestKubernetesVersion), "--alsologtostderr", "-v=1"}, StartArgs()...) - rr = &RunResult{} - r = func() error { - rr, err = Run(t, exec.CommandContext(ctx, tf.Name(), args...)) - return err - } - - if err := retry.Expo(r, 1*time.Second, Minutes(30), 3); err == nil { - t.Fatalf("downgrading kubernetes should not be allowed: %v", err) + if rr, err := Run(t, exec.CommandContext(ctx, tf.Name(), args...)); err == nil { + t.Fatalf("downgrading kubernetes should not be allowed. expected to see error but got %v for %q", err, rr.Args()) } args = append([]string{"start", "-p", profile, fmt.Sprintf("--kubernetes-version=%s", constants.NewestKubernetesVersion), "--alsologtostderr", "-v=1"}, StartArgs()...)