- rebase and update testcase with new inputs

- small adjustments to align with skipped behavior

Author: mikepenz

__tests__/testParser.test.ts

@@ -1270,17 +1270,19 @@ describe('parseTestReports', () => {
   })
 
   it('should parse retried tests', async () => {
-    const {checkName, summary, totalCount, skipped, failed, passed, retried, globalAnnotations} = await parseTestReports(
-      'checkName',
-      'summary',
-      'test_results/junit-server-test/report.xml',
-      '*',
-      true,
-      true,
-      [],
-      '{{SUITE_NAME}}/{{TEST_NAME}}',
-      '/'
-    )
+    const {checkName, summary, totalCount, skipped, failed, passed, retried, globalAnnotations} =
+      await parseTestReports(
+        'checkName',
+        'summary',
+        'test_results/junit-server-test/report.xml',
+        '*',
+        true,
+        true,
+        true,
+        [],
+        '{{SUITE_NAME}}/{{TEST_NAME}}',
+        '/'
+      )
 
     expect(checkName).toBe('checkName')
     expect(summary).toBe('summary')
@@ -1314,21 +1316,21 @@ describe('parseTestReports', () => {
         start_column: 0,
         start_line: 1,
         status: 'skipped',
-        title: 'github.com/example/example/server/v8/channels/api4/TestCreateChannelBookmark',
+        title: 'github.com/example/example/server/v8/channels/api4/TestCreateChannelBookmark'
       },
       {
-          annotation_level: 'notice',
-          end_column: 0,
-          end_line: 1,
-          message: 'TestWebSocketUpgrade',
-          path: 'com/example/example/server/v8/channels/api4',
-          raw_details: '',
-          retries: 0,
-          start_column: 0,
-          start_line: 1,
-          status: 'success',
-          title: 'github.com/example/example/server/v8/channels/api4/TestWebSocketUpgrade',
-        }
+        annotation_level: 'notice',
+        end_column: 0,
+        end_line: 1,
+        message: 'TestWebSocketUpgrade',
+        path: 'com/example/example/server/v8/channels/api4',
+        raw_details: '',
+        retries: 0,
+        start_column: 0,
+        start_line: 1,
+        status: 'success',
+        title: 'github.com/example/example/server/v8/channels/api4/TestWebSocketUpgrade'
+      }
     ])
   })
 

dist/index.js

@@ -355,6 +355,7 @@ async function parseSuite(
       childSuiteResults.push(childSuiteResult)
       totalCount += childSuiteResult.totalCount
       skippedCount += childSuiteResult.skippedCount
+      retriedCount += childSuiteResult.retriedCount
     }
 
     // skip out if we reached our annotations limit
@@ -424,7 +425,6 @@ async function parseTestCases(
           testcaseMap.set(key, testcase)
           retriedCount += 1
           core.debug(`Drop flaky test failure for (2): ${JSON.stringify(testcase)}`)
-          core.debug(`Drop flaky test failure for (2): ${key}`)
         }
       } else {
         testcaseMap.set(key, testcase)
@@ -599,6 +599,7 @@ export async function parseTestReports(
   const testResults: ActualTestResult[] = []
   let totalCount = 0
   let skipped = 0
+  let retried = 0
   let foundFiles = 0
   for await (const file of globber.globGenerator()) {
     foundFiles++
@@ -623,9 +624,10 @@ export async function parseTestReports(
     )
 
     if (!testResult) continue
-    const {totalCount: c, skippedCount: s} = testResult
+    const {totalCount: c, skippedCount: s, retriedCount: r} = testResult
     totalCount += c
     skipped += s
+    retried += r
     testResults.push(testResult)
 
     if (annotationsLimit > 0 && globalAnnotations.length >= annotationsLimit) {
@@ -636,7 +638,6 @@ export async function parseTestReports(
   // get the count of passed and failed tests.
   const failed = globalAnnotations.filter(a => a.annotation_level === 'failure').length
   const passed = totalCount - failed - skipped
-  const retried = globalAnnotations.filter(a => a.retries > 0).length
 
   return {
     checkName,