integration test testing

see if waiting longer allows the server to reload

Author: loosebazooka

.travis.yml

@@ -56,6 +56,7 @@ jobs:
         directories:
           - $HOME/.cache/go-build
           - $HOME/.gradle
+          - $HOME/.m2
     - os: linux
       name: "diag/Linux unit"
       script:

Makefile

@@ -183,6 +183,7 @@ integration-in-kind: skaffold-builder
 		-v /tmp/docker-config:/root/.docker/config.json \
 		-v $(CURDIR)/hack/maven/settings.xml:/root/.m2/settings.xml \
 		-e KUBECONFIG=/tmp/kind-config \
+    -e INTEGRATION_TEST_ARGS="-run=TestDevAutoSync" \
 		gcr.io/$(GCP_PROJECT)/skaffold-builder \
 		sh -c ' \
 			kind get clusters | grep -q kind || TERM=dumb kind create cluster --image=kindest/node:v1.13.12@sha256:ad1dd06aca2b85601f882ba1df4fdc03d5a57b304652d0e81476580310ba6289; \

integration/sync_test.go

@@ -17,7 +17,9 @@ limitations under the License.
 package integration
 
 import (
+	"bufio"
 	"context"
+	"fmt"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -113,10 +115,21 @@ func TestDevAutoSync(t *testing.T) {
 			ns, client, deleteNs := SetupNamespace(t)
 			defer deleteNs()
 
-			stop := skaffold.Dev("--trigger", "notify").WithProfiles(test.profiles).InDir(dir).InNs(ns.Name).RunBackground(t)
-			defer stop()
+			devOut, cancel := skaffold.Dev("--trigger", "notify").WithProfiles(test.profiles).InDir(dir).InNs(ns.Name).RunBackgroundOutput(t)
+			defer cancel()
+
+			go func() {
+				scanner := bufio.NewScanner(devOut)
+				scanner.Split(bufio.ScanLines)
+				for scanner.Scan() {
+					fmt.Println("STDOUT:" + scanner.Text());
+				}
+			}()
 
 			client.WaitForPodsReady("test-file-sync")
+			// give the server a chance to warm up, integration tests in KIND have a tendency to fail if
+			// this doesn't happen, I can't recreate this in any other environment
+			// time.Sleep(time.Second * 5)
 
 			// direct file sync (this file is an existing file checked in for this testdata)
 			directFile := "direct-file"
@@ -142,9 +155,11 @@ func TestDevAutoSync(t *testing.T) {
 				if err := ioutil.WriteFile(generatedFileSrc, []byte(newContents), 0644); err != nil {
 					t.Fatalf("Failed to write new contents to file %s", generatedFileSrc)
 				}
-				defer func() { ioutil.WriteFile(generatedFileSrc, oldContents, 0644) }()
+				defer func() {
+					ioutil.WriteFile(generatedFileSrc, oldContents, 0644)
+				}()
 			}
-			err = wait.PollImmediate(time.Millisecond*500, 1*time.Minute, func() (bool, error) {
+			err = wait.PollImmediate(time.Millisecond*500, 3*time.Minute, func() (bool, error) {
 				// distroless debug only has wget, not curl
 				out, _ := exec.Command("kubectl", "exec", "test-file-sync", "-n", ns.Name, "--", "wget", "localhost:8080/", "-q", "-O", "-").Output()
 				return string(out) == test.uniqueStr, nil