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

change all timeouts in the integration tests

pull/6723/head
Medya Gh 2020-02-20 16:40:18 -08:00
parent 6e0aeda4ea
commit 763d54025c
8 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/integration/addons_test.go
View File

@ -90,10 +90,10 @@ func validateIngressAddon(ctx context.Context, t *testing.T, profile string) {
t.Fatalf("kubernetes client: %v", client)
}
if err := kapi.WaitForDeploymentToStabilize(client, "kube-system", "nginx-ingress-controller", 6*time.Minute); err != nil {
if err := kapi.WaitForDeploymentToStabilize(client, "kube-system", "nginx-ingress-controller", Minutes(6)); err != nil {
t.Errorf("waiting for ingress-controller deployment to stabilize: %v", err)
}
if _, err := PodWait(ctx, t, profile, "kube-system", "app.kubernetes.io/name=nginx-ingress-controller", 12*time.Minute); err != nil {
if _, err := PodWait(ctx, t, profile, "kube-system", "app.kubernetes.io/name=nginx-ingress-controller", Minutes(12)); err != nil {
t.Fatalf("wait: %v", err)
}
@ -106,10 +106,10 @@ func validateIngressAddon(ctx context.Context, t *testing.T, profile string) {
t.Errorf("%s failed: %v", rr.Args, err)
}
if _, err := PodWait(ctx, t, profile, "default", "run=nginx", 4*time.Minute); err != nil {
if _, err := PodWait(ctx, t, profile, "default", "run=nginx", Minutes(4)); err != nil {
t.Fatalf("wait: %v", err)
}
if err := kapi.WaitForService(client, "default", "nginx", true, time.Millisecond*500, time.Minute*10); err != nil {
if err := kapi.WaitForService(client, "default", "nginx", true, time.Millisecond*500, Minutes(10)); err != nil {
t.Errorf("Error waiting for nginx service to be up")
}
@ -128,7 +128,7 @@ func validateIngressAddon(ctx context.Context, t *testing.T, profile string) {
return nil
}
if err := retry.Expo(checkIngress, 500*time.Millisecond, time.Minute); err != nil {
if err := retry.Expo(checkIngress, 500*time.Millisecond, Minutes(1)); err != nil {
t.Errorf("ingress never responded as expected on 127.0.0.1:80: %v", err)
}
@ -145,15 +145,15 @@ func validateRegistryAddon(ctx context.Context, t *testing.T, profile string) {
}
start := time.Now()
if err := kapi.WaitForRCToStabilize(client, "kube-system", "registry", 6*time.Minute); err != nil {
if err := kapi.WaitForRCToStabilize(client, "kube-system", "registry", Minutes(6)); err != nil {
t.Errorf("waiting for registry replicacontroller to stabilize: %v", err)
}
t.Logf("registry stabilized in %s", time.Since(start))
if _, err := PodWait(ctx, t, profile, "kube-system", "actual-registry=true", 6*time.Minute); err != nil {
if _, err := PodWait(ctx, t, profile, "kube-system", "actual-registry=true", Minutes(6)); err != nil {
t.Fatalf("wait: %v", err)
}
if _, err := PodWait(ctx, t, profile, "kube-system", "registry-proxy=true", 10*time.Minute); err != nil {
if _, err := PodWait(ctx, t, profile, "kube-system", "registry-proxy=true", Minutes(10)); err != nil {
t.Fatalf("wait: %v", err)
}
@ -198,7 +198,7 @@ func validateRegistryAddon(ctx context.Context, t *testing.T, profile string) {
return nil
}
if err := retry.Expo(checkExternalAccess, 500*time.Millisecond, 2*time.Minute); err != nil {
if err := retry.Expo(checkExternalAccess, 500*time.Millisecond, Minutes(2)); err != nil {
t.Errorf(err.Error())
}
@ -215,12 +215,12 @@ func validateMetricsServerAddon(ctx context.Context, t *testing.T, profile strin
}
start := time.Now()
if err := kapi.WaitForDeploymentToStabilize(client, "kube-system", "metrics-server", 6*time.Minute); err != nil {
if err := kapi.WaitForDeploymentToStabilize(client, "kube-system", "metrics-server", Minutes(6)); err != nil {
t.Errorf("waiting for metrics-server deployment to stabilize: %v", err)
}
t.Logf("metrics-server stabilized in %s", time.Since(start))
if _, err := PodWait(ctx, t, profile, "kube-system", "k8s-app=metrics-server", 6*time.Minute); err != nil {
if _, err := PodWait(ctx, t, profile, "kube-system", "k8s-app=metrics-server", Minutes(6)); err != nil {
t.Fatalf("wait: %v", err)
}
@ -240,7 +240,7 @@ func validateMetricsServerAddon(ctx context.Context, t *testing.T, profile strin
}
// metrics-server takes some time to be able to collect metrics
if err := retry.Expo(checkMetricsServer, time.Minute, 5*time.Minute); err != nil {
if err := retry.Expo(checkMetricsServer, Seconds(13), Minutes(6)); err != nil {
t.Errorf(err.Error())
}

2
test/integration/fn_mount_cmd.go
View File

@ -139,7 +139,7 @@ func validateMountCmd(ctx context.Context, t *testing.T, profile string) {
t.Fatalf("%s failed: %v", rr.Args, err)
}
if _, err := PodWait(ctx, t, profile, "default", "integration-test=busybox-mount", 4*time.Minute); err != nil {
if _, err := PodWait(ctx, t, profile, "default", "integration-test=busybox-mount", Minutes(4)); err != nil {
t.Fatalf("wait: %v", err)
}

4
test/integration/fn_pvc.go
View File

@ -37,7 +37,7 @@ func validatePersistentVolumeClaim(ctx context.Context, t *testing.T, profile st
ctx, cancel := context.WithTimeout(ctx, Minutes(10))
defer cancel()
if _, err := PodWait(ctx, t, profile, "kube-system", "integration-test=storage-provisioner", 4*time.Minute); err != nil {
if _, err := PodWait(ctx, t, profile, "kube-system", "integration-test=storage-provisioner", Minutes(4)); err != nil {
t.Fatalf("wait: %v", err)
}
@ -83,7 +83,7 @@ func validatePersistentVolumeClaim(ctx context.Context, t *testing.T, profile st
return fmt.Errorf("testpvc phase = %q, want %q (msg=%+v)", pvc.Status.Phase, "Bound", pvc)
}
if err := retry.Expo(checkStoragePhase, 2*time.Second, 4*time.Minute); err != nil {
if err := retry.Expo(checkStoragePhase, 2*time.Second, Minutes(4)); err != nil {
t.Fatalf("PV Creation failed with error: %v", err)
}
}

8
test/integration/fn_tunnel_cmd.go
View File

@ -71,17 +71,17 @@ func validateTunnelCmd(ctx context.Context, t *testing.T, profile string) {
if err != nil {
t.Fatalf("%s failed: %v", rr.Args, err)
}
if _, err := PodWait(ctx, t, profile, "default", "run=nginx-svc", 4*time.Minute); err != nil {
if _, err := PodWait(ctx, t, profile, "default", "run=nginx-svc", Minutes(4)); err != nil {
t.Fatalf("wait: %v", err)
}
if err := kapi.WaitForService(client, "default", "nginx-svc", true, 1*time.Second, 2*time.Minute); err != nil {
if err := kapi.WaitForService(client, "default", "nginx-svc", true, 1*time.Second, Minutes(2)); err != nil {
t.Fatal(errors.Wrap(err, "Error waiting for nginx service to be up"))
}
// Wait until the nginx-svc has a loadbalancer ingress IP
nginxIP := ""
err = wait.PollImmediate(1*time.Second, 3*time.Minute, func() (bool, error) {
err = wait.PollImmediate(1*time.Second, Minutes(3), func() (bool, error) {
rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "get", "svc", "nginx-svc", "-o", "jsonpath={.status.loadBalancer.ingress[0].ip}"))
if err != nil {
return false, err
@ -119,7 +119,7 @@ func validateTunnelCmd(ctx context.Context, t *testing.T, profile string) {
}
return nil
}
if err = retry.Expo(fetch, time.Millisecond*500, 2*time.Minute, 6); err != nil {
if err = retry.Expo(fetch, time.Millisecond*500, Minutes(2), 6); err != nil {
t.Errorf("failed to contact nginx at %s: %v", nginxIP, err)
}

8
test/integration/functional_test.go
View File

@ -327,7 +327,7 @@ func validateDNS(ctx context.Context, t *testing.T, profile string) {
t.Fatalf("%s failed: %v", rr.Args, err)
}
names, err := PodWait(ctx, t, profile, "default", "integration-test=busybox", 5*time.Minute)
names, err := PodWait(ctx, t, profile, "default", "integration-test=busybox", Minutes)
if err != nil {
t.Fatalf("wait: %v", err)
}
@ -338,7 +338,7 @@ func validateDNS(ctx context.Context, t *testing.T, profile string) {
}
// If the coredns process was stable, this retry wouldn't be necessary.
if err = retry.Expo(nslookup, 1*time.Second, 1*time.Minute); err != nil {
if err = retry.Expo(nslookup, 1*time.Second, Minutes(1)); err != nil {
t.Errorf("nslookup failing: %v", err)
}
@ -580,7 +580,7 @@ func validateServiceCmd(ctx context.Context, t *testing.T, profile string) {
t.Logf("%s failed: %v (may not be an error)", rr.Args, err)
}
if _, err := PodWait(ctx, t, profile, "default", "app=hello-node", 10*time.Minute); err != nil {
if _, err := PodWait(ctx, t, profile, "default", "app=hello-node", Minutes(10)); err != nil {
t.Fatalf("wait: %v", err)
}
@ -691,7 +691,7 @@ func validateMySQL(ctx context.Context, t *testing.T, profile string) {
t.Fatalf("%s failed: %v", rr.Args, err)
}
names, err := PodWait(ctx, t, profile, "default", "app=mysql", 10*time.Minute)
names, err := PodWait(ctx, t, profile, "default", "app=mysql", Minutes(10))
if err != nil {
t.Fatalf("podwait: %v", err)
}

12
test/integration/gvisor_addon_test.go
View File

@ -65,7 +65,7 @@ func TestGvisorAddon(t *testing.T) {
t.Fatalf("%s failed: %v", rr.Args, err)
}
if _, err := PodWait(ctx, t, profile, "kube-system", "kubernetes.io/minikube-addons=gvisor", 4*time.Minute); err != nil {
if _, err := PodWait(ctx, t, profile, "kube-system", "kubernetes.io/minikube-addons=gvisor", Minutes(4)); err != nil {
t.Fatalf("waiting for gvisor controller to be up: %v", err)
}
@ -80,10 +80,10 @@ func TestGvisorAddon(t *testing.T) {
t.Fatalf("%s failed: %v", rr.Args, err)
}
if _, err := PodWait(ctx, t, profile, "default", "run=nginx,untrusted=true", 4*time.Minute); err != nil {
if _, err := PodWait(ctx, t, profile, "default", "run=nginx,untrusted=true", Minutes(4)); err != nil {
t.Errorf("nginx: %v", err)
}
if _, err := PodWait(ctx, t, profile, "default", "run=nginx,runtime=gvisor", 4*time.Minute); err != nil {
if _, err := PodWait(ctx, t, profile, "default", "run=nginx,runtime=gvisor", Minutes(4)); err != nil {
t.Errorf("nginx: %v", err)
}
@ -97,13 +97,13 @@ func TestGvisorAddon(t *testing.T) {
if err != nil {
t.Fatalf("%s failed: %v", rr.Args, err)
}
if _, err := PodWait(ctx, t, profile, "kube-system", "kubernetes.io/minikube-addons=gvisor", 4*time.Minute); err != nil {
if _, err := PodWait(ctx, t, profile, "kube-system", "kubernetes.io/minikube-addons=gvisor", Minutes(4)); err != nil {
t.Errorf("waiting for gvisor controller to be up: %v", err)
}
if _, err := PodWait(ctx, t, profile, "default", "run=nginx,untrusted=true", 4*time.Minute); err != nil {
if _, err := PodWait(ctx, t, profile, "default", "run=nginx,untrusted=true", Minutes(4)); err != nil {
t.Errorf("nginx: %v", err)
}
if _, err := PodWait(ctx, t, profile, "default", "run=nginx,runtime=gvisor", 4*time.Minute); err != nil {
if _, err := PodWait(ctx, t, profile, "default", "run=nginx,runtime=gvisor", Minutes(4)); err != nil {
t.Errorf("nginx: %v", err)
}
}

6
test/integration/start_stop_delete_test.go
View File

@ -128,10 +128,10 @@ func TestStartStop(t *testing.T) {
if strings.Contains(tc.name, "cni") {
t.Logf("WARNING: cni mode requires additional setup before pods can schedule :(")
} else {
if _, err := PodWait(ctx, t, profile, "default", "integration-test=busybox", 4*time.Minute); err != nil {
if _, err := PodWait(ctx, t, profile, "default", "integration-test=busybox", Minutes(4)); err != nil {
t.Fatalf("post-stop-start pod wait: %v", err)
}
if _, err := PodWait(ctx, t, profile, "kubernetes-dashboard", "k8s-app=kubernetes-dashboard", 4*time.Minute); err != nil {
if _, err := PodWait(ctx, t, profile, "kubernetes-dashboard", "k8s-app=kubernetes-dashboard", Minutes(4)); err != nil {
t.Fatalf("post-stop-start addon wait: %v", err)
}
}
@ -178,7 +178,7 @@ func testPodScheduling(ctx context.Context, t *testing.T, profile string) {
}
// 8 minutes, because 4 is not enough for images to pull in all cases.
names, err := PodWait(ctx, t, profile, "default", "integration-test=busybox", 8*time.Minute)
names, err := PodWait(ctx, t, profile, "default", "integration-test=busybox", Minutes(8))
if err != nil {
t.Fatalf("wait: %v", err)
}

6
test/integration/version_upgrade_test.go
View File

@ -55,7 +55,7 @@ func TestVersionUpgrade(t *testing.T) {
tf.Close()
url := pkgutil.GetBinaryDownloadURL("latest", runtime.GOOS)
if err := retry.Expo(func() error { return getter.GetFile(tf.Name(), url) }, 3*time.Second, 3*time.Minute); err != nil {
if err := retry.Expo(func() error { return getter.GetFile(tf.Name(), url) }, 3*time.Second, Minutes(3)); err != nil {
t.Fatalf("get failed: %v", err)
}
@ -73,7 +73,7 @@ func TestVersionUpgrade(t *testing.T) {
}
// Retry to allow flakiness for the previous release
if err := retry.Expo(r, 1*time.Second, 30*time.Minute, 3); err != nil {
if err := retry.Expo(r, 1*time.Second, Minutes(30), 3); err != nil {
t.Fatalf("release start failed: %v", err)
}
@ -123,7 +123,7 @@ func TestVersionUpgrade(t *testing.T) {
return err
}
if err := retry.Expo(r, 1*time.Second, 30*time.Minute, 3); err == nil {
if err := retry.Expo(r, 1*time.Second, Minutes(30), 3); err == nil {
t.Fatalf("downgrading kubernetes should not be allowed: %v", err)
}