kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove not needed retry

pull/7202/head
Medya Gh 2020-03-24 06:29:35 -07:00
parent 407637b4a2
commit 42980d609b
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/functional_test.go
View File

@ -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)
}
}

12
test/integration/version_upgrade_test.go
View File

@ -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()...)