Make sure we use the same test name for reruns (#326)

GoogleCloudPlatform · Apr 16, 2021 · 59971ea · 59971ea
1 parent ebdf637
commit 59971ea
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/e2e_tests/test_suites/guestpolicies/guest_policies.go b/e2e_tests/test_suites/guestpolicies/guest_policies.go
@@ -21,6 +21,7 @@ import (
 	"log"
 	"path"
 	"regexp"
+	"strings"
 	"sync"
 	"time"
 
@@ -214,7 +215,7 @@ func packageManagementTestCase(ctx context.Context, testSetup *guestPolicyTestSe
 		logger.Printf("Running TestCase %q", tc.Name)
 		runTest(ctx, tc, testSetup, logger)
 		if tc.Failure != nil {
-			rerunTC := junitxml.NewTestCase(testSuiteName, tc.Name)
+			rerunTC := junitxml.NewTestCase(testSuiteName, strings.TrimPrefix(tc.Name, fmt.Sprintf("[%s] ", testSuiteName)))
 			wg.Add(1)
 			go func() {
 				defer wg.Done()

diff --git a/e2e_tests/test_suites/inventoryreporting/inventory_reporting.go b/e2e_tests/test_suites/inventoryreporting/inventory_reporting.go
@@ -20,6 +20,7 @@ import (
 	"log"
 	"path"
 	"regexp"
+	"strings"
 	"sync"
 	"time"
 
@@ -167,7 +168,7 @@ func inventoryReportingTestCase(ctx context.Context, testSetup *inventoryTestSet
 	logger.Printf("Running TestCase %q", inventoryTest.Name)
 	runInventoryReportingTest(ctx, testSetup, inventoryTest)
 	if inventoryTest.Failure != nil {
-		rerunTC := junitxml.NewTestCase(testSuiteName, inventoryTest.Name)
+		rerunTC := junitxml.NewTestCase(testSuiteName, strings.TrimPrefix(inventoryTest.Name, fmt.Sprintf("[%s] ", testSuiteName)))
 		wg.Add(1)
 		go func() {
 			defer wg.Done()

diff --git a/e2e_tests/test_suites/ospolicies/ospolicies.go b/e2e_tests/test_suites/ospolicies/ospolicies.go
@@ -230,7 +230,7 @@ func testCase(ctx context.Context, testSetup *osPolicyTestSetup, tests chan *jun
 		logger.Printf("Running TestCase %q", tc.Name)
 		runTest(ctx, tc, testSetup, logger)
 		if tc.Failure != nil {
-			rerunTC := junitxml.NewTestCase(testSuiteName, tc.Name)
+			rerunTC := junitxml.NewTestCase(testSuiteName, strings.TrimPrefix(tc.Name, fmt.Sprintf("[%s] ", testSuiteName)))
 			wg.Add(1)
 			go func() {
 				defer wg.Done()