fix: update test timeouts

Author: gsquared94

.github/workflows/verify-examples.yml

@@ -59,7 +59,7 @@ jobs:
         for dir in $CHANGED_EXAMPLES; do
             (cd $dir && echo ">> $dir" && \
                 if [ $(expr "$($SKAFFOLD_BINARY inspect build-env list)" : '.*"type":"local".*') -gt 0 ]; then \
-                    $SKAFFOLD_BINARY build --push=false; \
+                    $SKAFFOLD_BINARY build --push=false --cache-artifacts=false; \
                 else \
                     echo "skipping $dir: not local build-env"; \
                 fi) \

integration/control_api_test.go

@@ -45,11 +45,6 @@ func TestControlAPIManualTriggers(t *testing.T) {
 
 	rpcClient, entries := apiEvents(t, rpcAddr)
 
-	// throw away first 5 entries of log (from first run of dev loop)
-	for i := 0; i < 5; i++ {
-		<-entries
-	}
-
 	dep := client.GetDeployment(testDev)
 
 	// Make a change to foo

integration/dev_test.go

@@ -150,7 +150,6 @@ func TestDevAPITriggers(t *testing.T) {
 	skaffold.Dev("--auto-build=false", "--auto-sync=false", "--auto-deploy=false", "--rpc-port", rpcAddr, "--cache-artifacts=false").InDir("testdata/dev").InNs(ns.Name).RunBackground(t)
 
 	rpcClient, entries := apiEvents(t, rpcAddr)
-
 	dep := client.GetDeployment(testDev)
 
 	// Make a change to foo
@@ -194,12 +193,6 @@ func TestDevAPIAutoTriggers(t *testing.T) {
 	skaffold.Dev("--auto-build=false", "--auto-sync=false", "--auto-deploy=false", "--rpc-port", rpcAddr, "--cache-artifacts=false").InDir("testdata/dev").InNs(ns.Name).RunBackground(t)
 
 	rpcClient, entries := apiEvents(t, rpcAddr)
-
-	// throw away first 5 entries of log (from first run of dev loop)
-	for i := 0; i < 5; i++ {
-		<-entries
-	}
-
 	dep := client.GetDeployment(testDev)
 
 	// Make a change to foo
@@ -237,7 +230,7 @@ func verifyDeployment(t *testing.T, entries chan *proto.LogEntry, client *NSKube
 	failNowIfError(t, err)
 
 	// Make sure the old Deployment and the new Deployment are different
-	err = wait.Poll(time.Millisecond*500, 1*time.Minute, func() (bool, error) {
+	err = wait.Poll(5*time.Second, 3*time.Minute, func() (bool, error) {
 		newDep := client.GetDeployment(testDev)
 		t.Logf("old gen: %d, new gen: %d", dep.GetGeneration(), newDep.GetGeneration())
 		return dep.GetGeneration() != newDep.GetGeneration(), nil

integration/rpc_test.go

@@ -437,7 +437,7 @@ func setupRPCClient(t *testing.T, port string) proto.SkaffoldServiceClient {
 
 	// connect to the skaffold grpc server
 	for i := 0; i < connectionRetries; i++ {
-		conn, err = grpc.Dial(fmt.Sprintf(":%s", port), grpc.WithInsecure(), grpc.WithBackoffMaxDelay(10*time.Second))
+		conn, err = grpc.Dial(fmt.Sprintf(":%s", port), grpc.WithInsecure())
 		if err != nil {
 			t.Logf("unable to establish skaffold grpc connection: retrying...")
 			time.Sleep(waitTime)

integration/sync_test.go

@@ -202,14 +202,8 @@ func TestDevSyncAPITrigger(t *testing.T) {
 
 	rpcAddr := randomPort()
 	skaffold.Dev("--auto-sync=false", "--rpc-port", rpcAddr).InDir("testdata/file-sync").WithConfig("skaffold-manual.yaml").InNs(ns.Name).RunBackground(t)
-
 	rpcClient, entries := apiEvents(t, rpcAddr)
 
-	// throw away first 5 entries of log (from first run of dev loop)
-	for i := 0; i < 5; i++ {
-		<-entries
-	}
-
 	client.WaitForPodsReady("test-file-sync")
 
 	ioutil.WriteFile("testdata/file-sync/foo", []byte("foo"), 0644)

integration/util.go

@@ -337,7 +337,10 @@ func (k *NSKubernetesClient) waitForDeploymentsToStabilizeWithTimeout(timeout ti
 			k.t.Fatalf("Timed out waiting for deployments %v to stabilize in namespace %s", depNames, k.ns)
 
 		case event := <-w.ResultChan():
-			dp := event.Object.(*appsv1.Deployment)
+			dp, ok := event.Object.(*appsv1.Deployment)
+			if !ok {
+				continue
+			}
 			desiredReplicas := *(dp.Spec.Replicas)
 			log.Entry(ctx).Infof("Deployment %s: Generation %d/%d, Replicas %d/%d, Available %d/%d",
 				dp.Name,