From e338ac0cc99adc8e3c44f7dcbf9d1bf5a28fb442 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Wed, 13 Nov 2019 06:42:07 -0800 Subject: [PATCH] Double pod test waits --- test/integration/addons_test.go | 2 +- test/integration/fn_mount_cmd.go | 2 +- test/integration/fn_pvc.go | 4 ++-- test/integration/gvisor_addon_test.go | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go index a575e96eb57b..b3ea1f10689f 100644 --- a/test/integration/addons_test.go +++ b/test/integration/addons_test.go @@ -107,7 +107,7 @@ 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", 2*time.Minute); err != nil { + if _, err := PodWait(ctx, t, profile, "default", "run=nginx", 4*time.Minute); err != nil { t.Fatalf("wait: %v", err) } if err := kapi.WaitForService(client, "default", "nginx", true, time.Millisecond*500, time.Minute*10); err != nil { diff --git a/test/integration/fn_mount_cmd.go b/test/integration/fn_mount_cmd.go index 277b8951423d..7888971be886 100644 --- a/test/integration/fn_mount_cmd.go +++ b/test/integration/fn_mount_cmd.go @@ -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", 2*time.Minute); err != nil { + if _, err := PodWait(ctx, t, profile, "default", "integration-test=busybox-mount", 4*time.Minute); err != nil { t.Fatalf("wait: %v", err) } diff --git a/test/integration/fn_pvc.go b/test/integration/fn_pvc.go index 54e1e8e93eb4..3110d455009d 100644 --- a/test/integration/fn_pvc.go +++ b/test/integration/fn_pvc.go @@ -37,7 +37,7 @@ func validatePersistentVolumeClaim(ctx context.Context, t *testing.T, profile st ctx, cancel := context.WithTimeout(ctx, 10*time.Minute) defer cancel() - if _, err := PodWait(ctx, t, profile, "kube-system", "integration-test=storage-provisioner", 2*time.Minute); err != nil { + if _, err := PodWait(ctx, t, profile, "kube-system", "integration-test=storage-provisioner", 4*time.Minute); 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, 2*time.Minute); err != nil { + if err := retry.Expo(checkStoragePhase, 2*time.Second, 4*time.Minute); err != nil { t.Fatalf("PV Creation failed with error: %v", err) } } diff --git a/test/integration/gvisor_addon_test.go b/test/integration/gvisor_addon_test.go index f8ffb4d2c0ce..172802ceea95 100644 --- a/test/integration/gvisor_addon_test.go +++ b/test/integration/gvisor_addon_test.go @@ -75,7 +75,7 @@ func TestGvisorAddon(t *testing.T) { } }() - if _, err := PodWait(ctx, t, profile, "kube-system", "kubernetes.io/minikube-addons=gvisor", 2*time.Minute); err != nil { + if _, err := PodWait(ctx, t, profile, "kube-system", "kubernetes.io/minikube-addons=gvisor", 4*time.Minute); err != nil { t.Fatalf("waiting for gvisor controller to be up: %v", err) } @@ -90,10 +90,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", 2*time.Minute); err != nil { + if _, err := PodWait(ctx, t, profile, "default", "run=nginx,untrusted=true", 4*time.Minute); err != nil { t.Errorf("nginx: %v", err) } - if _, err := PodWait(ctx, t, profile, "default", "run=nginx,runtime=gvisor", 2*time.Minute); err != nil { + if _, err := PodWait(ctx, t, profile, "default", "run=nginx,runtime=gvisor", 4*time.Minute); err != nil { t.Errorf("nginx: %v", err) } @@ -107,13 +107,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", 2*time.Minute); err != nil { + if _, err := PodWait(ctx, t, profile, "kube-system", "kubernetes.io/minikube-addons=gvisor", 4*time.Minute); err != nil { t.Errorf("waiting for gvisor controller to be up: %v", err) } - if _, err := PodWait(ctx, t, profile, "default", "run=nginx,untrusted=true", 2*time.Minute); err != nil { + if _, err := PodWait(ctx, t, profile, "default", "run=nginx,untrusted=true", 4*time.Minute); err != nil { t.Errorf("nginx: %v", err) } - if _, err := PodWait(ctx, t, profile, "default", "run=nginx,runtime=gvisor", 2*time.Minute); err != nil { + if _, err := PodWait(ctx, t, profile, "default", "run=nginx,runtime=gvisor", 4*time.Minute); err != nil { t.Errorf("nginx: %v", err) } }