refactor test and add framework function to allow for initial failure…

…s before requiring only success

Signed-off-by: Thomas Stringer <thstring@microsoft.com>

tests/e2e/e2e_multiple_ports_per_service_test.go

@@ -80,31 +80,15 @@ func testMultipleServicePorts() {
 			Destination:     fmt.Sprintf("%s.%s", serverService.Name, serverService.Namespace),
 		}
 
-		// Make a set amount of HTTP requests from the client application to
-		// the server application. We should not use the helper function
-		// WaitForRepeatedSuccess, because at the moment this function does
-		// accept a certain amount of failure as long as there is an uninterrupted
-		// set amount of success. In this case, we want 100% of all requests to
-		// succeed without any failure. In the future we can consider adding
-		// a test framework function (e.g. WaitForAllSuccess) if this logic is
-		// also needed in other tests.
-		allRequestsSucceeded := true
-		failureStatusCode := 0
-		for i := 0; i < 10; i++ {
+		cond := Td.WaitForSuccessAfterInitialFailure(func() bool {
 			result := Td.HTTPRequest(clientToServerRequest)
 			if result.Err != nil || result.StatusCode != 200 {
 				Td.T.Logf("> HTTP request failed %d %v", result.StatusCode, result.Err)
-				allRequestsSucceeded = false
-				failureStatusCode = result.StatusCode
-				break
+				return false
 			}
 			Td.T.Logf("> HTTP request succeeded")
-		}
-
-		failureMessage := fmt.Sprintf(
-			"Client failed to connect to server: %d",
-			failureStatusCode,
-		)
-		Expect(allRequestsSucceeded).To(BeTrue(), failureMessage)
+			return true
+		}, 10, 90*time.Second)
+		Expect(cond).To(BeTrue())
 	})
 }

tests/framework/common.go

@@ -1113,6 +1113,29 @@ func (td *OsmTestData) WaitForRepeatedSuccess(f SuccessFunction, minItForSuccess
 	return false
 }
 
+// WaitForSuccessAfterInitialFailure runs and expects a certain result for a certain operation a set number of consecutive times
+// but requires only success after the first success.
+func (td *OsmTestData) WaitForSuccessAfterInitialFailure(f SuccessFunction, minItForSuccess int, maxWaitTime time.Duration) bool {
+	iterations := 0
+	startTime := time.Now()
+	successHasStarted := false
+
+	By(fmt.Sprintf("[WaitForSuccessAfterFailureBuffer] waiting %v for %d iterations to succeed", maxWaitTime, minItForSuccess))
+	for time.Since(startTime) < maxWaitTime {
+		if f() {
+			successHasStarted = true
+			iterations++
+			if iterations >= minItForSuccess {
+				return true
+			}
+		} else if successHasStarted {
+			return false
+		}
+		time.Sleep(time.Second)
+	}
+	return false
+}
+
 // Cleanup is Used to cleanup resources once the test is done
 // Cyclomatic complexity is disabled in cleanup, as it check a large number of conditions
 // nolint:gocyclo