update app integration test result processing

The TestApplicationGoCounter in app_test.go is a little flaky,
occasionally failing. Seems to be failing more often with the recent
changes in bpfman. Turns out the log processing was always looking at
the oldest retrieved log, so if it didn't pass on the first read, it
would never pass. It was just random timing if the first log contained
packet counts or not.

Signed-off-by: Billy McFall <[email protected]>

Author: Billy99

Makefile

@@ -366,7 +366,7 @@ push-images: ## Push bpfman-agent and bpfman-operator images.
 
 .PHONY: load-images-kind
 load-images-kind: ## Load bpfman-agent, and bpfman-operator images into the running local kind devel cluster.
-	./hack/kind-load-image.sh ${KIND_CLUSTER_NAME} ${BPFMAN_OPERATOR_IMG} ${BPFMAN_AGENT_IMG} quay.io/bpfman/bpfman:latest
+	./hack/kind-load-image.sh ${KIND_CLUSTER_NAME} ${BPFMAN_OPERATOR_IMG} ${BPFMAN_AGENT_IMG}
 
 .PHONY: bundle-build
 bundle-build: ## Build the bundle image.

test/integration/app_test.go

@@ -69,10 +69,10 @@ func TestApplicationGoCounter(t *testing.T) {
 		require.Eventually(t, func() bool {
 			logs, err := req.Stream(ctx)
 			require.NoError(t, err)
-			defer logs.Close()
 			output := new(bytes.Buffer)
 			_, err = io.Copy(output, logs)
 			require.NoError(t, err)
+			logs.Close()
 
 			if f(t, output) {
 				return true

test/integration/common.go

@@ -121,8 +121,9 @@ func doAppXdpCheck(t *testing.T, output *bytes.Buffer) bool {
 func doProbeCommonCheck(t *testing.T, output *bytes.Buffer, str string) (bool, int) {
 	want := regexp.MustCompile(str)
 	matches := want.FindAllStringSubmatch(output.String(), -1)
-	if len(matches) >= 1 && len(matches[0]) >= 2 {
-		count, err := strconv.Atoi(matches[0][1])
+	numMatches := len(matches)
+	if numMatches >= 1 && len(matches[numMatches-1]) >= 2 {
+		count, err := strconv.Atoi(matches[numMatches-1][1])
 		require.NoError(t, err)
 		if count > 0 {
 			return true, count