Revert "Resolve the requested changes"

This reverts commit 4ad64eb.
Ralaam · Mar 1, 2023 · d32c9c7 · d32c9c7
1 parent 4ad64eb
commit d32c9c7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 42 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -44,7 +44,6 @@ jobs:
       - name: Integration Tests
         env:
           GH_ACTION: true
-          GH_ACTION_RETRIES: "3"
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         run: |
           chmod +x run.sh

diff --git a/v2/cmd/integration-test/integration-test.go b/v2/cmd/integration-test/integration-test.go
@@ -4,7 +4,6 @@ import (
 	"flag"
 	"fmt"
 	"os"
-	"strconv"
 	"strings"
 
 	"github.com/logrusorgru/aurora"
@@ -13,10 +12,9 @@ import (
 )
 
 var (
-	debug               = os.Getenv("DEBUG") == "true"
-	githubAction        = os.Getenv("GH_ACTION") == "true"
-	githubActionRetries = os.Getenv("GH_ACTION_RETRIES")
-	customTests         = os.Getenv("TESTS")
+	debug        = os.Getenv("DEBUG") == "true"
+	githubAction = os.Getenv("GH_ACTION") == "true"
+	customTests  = os.Getenv("TESTS")
 
 	success = aurora.Green("[✓]").String()
 	failed  = aurora.Red("[✘]").String()
@@ -63,13 +61,16 @@ func main() {
 		os.Exit(1)
 	}
 
-	failedTestCases := runTests(toMap(toSlice(customTests)))
+	failedTestTemplatePaths := runTests(toMap(toSlice(customTests)))
 
-	if githubAction {
-		if retryOnFailure(failedTestCases) {
-			os.Exit(1)
+	if len(failedTestTemplatePaths) > 0 {
+		if githubAction {
+			debug = true
+			fmt.Println("::group::Failed integration tests in debug mode")
+			_ = runTests(failedTestTemplatePaths)
+			fmt.Println("::endgroup::")
 		}
-	} else if len(failedTestCases) > 0 {
+
 		os.Exit(1)
 	}
 }
@@ -85,8 +86,8 @@ func debugTests() {
 	}
 }
 
-func runTests(customTemplatePaths map[string]struct{}) map[string]testutils.TestCase {
-	failedTestCase := map[string]testutils.TestCase{}
+func runTests(customTemplatePaths map[string]struct{}) map[string]struct{} {
+	failedTestTemplatePaths := map[string]struct{}{}
 
 	for proto, testCases := range protocolTests {
 		if len(customTemplatePaths) == 0 {
@@ -95,14 +96,14 @@ func runTests(customTemplatePaths map[string]struct{}) map[string]testutils.Test
 
 		for templatePath, testCase := range testCases {
 			if len(customTemplatePaths) == 0 || contains(customTemplatePaths, templatePath) {
-				if _, err := execute(testCase, templatePath); err != nil {
-					failedTestCase[templatePath] = testCase
+				if failedTemplatePath, err := execute(testCase, templatePath); err != nil {
+					failedTestTemplatePaths[failedTemplatePath] = struct{}{}
 				}
 			}
 		}
 	}
 
-	return failedTestCase
+	return failedTestTemplatePaths
 }
 
 func execute(testCase testutils.TestCase, templatePath string) (string, error) {
@@ -144,29 +145,3 @@ func contains(input map[string]struct{}, value string) bool {
 	_, ok := input[value]
 	return ok
 }
-
-// retries failed test cases and run the last retry in debug mode
-// if any case failed in retry retrun true
-func retryOnFailure(failedTestCases map[string]testutils.TestCase) bool {
-	retries, _ := strconv.Atoi(githubActionRetries)
-	var failed bool
-	for templatePath, testCase := range failedTestCases {
-		var err error
-		debug = false
-		fmt.Println("::group::Failed integration test", templatePath)
-		for i := 0; i < retries; i++ {
-			if (retries - i) == 1 {
-				debug = true
-			}
-			_, err = execute(testCase, templatePath)
-			if err == nil {
-				break
-			}
-		}
-		fmt.Println("::endgroup::")
-		if err != nil {
-			failed = true
-		}
-	}
-	return failed
-}