fix test suite duration

Author: juan-fernandez

packages/datadog-instrumentations/src/playwright.js

@@ -49,6 +49,7 @@ const STATUS_TO_TEST_STATUS = {
 }
 
 let remainingTestsByFile = {}
+let skippedTestsByFile = {}
 let isKnownTestsEnabled = false
 let isEarlyFlakeDetectionEnabled = false
 let earlyFlakeDetectionNumRetries = 0
@@ -127,15 +128,20 @@ function deepCloneSuite (suite, filterTest, tags = []) {
 }
 
 function getTestsBySuiteFromTestGroups (testGroups) {
-  return testGroups.reduce((acc, { requireFile, tests }) => {
-    if (acc[requireFile]) {
-      acc[requireFile].push(...tests)
-    } else {
-      // Copy the tests, otherwise we modify the original tests
-      acc[requireFile] = [...tests]
-    }
+  const nonSkippedTestGroups = testGroups.reduce((acc, { requireFile, tests }) => {
+    const nonSkippedTests = tests.filter(test => test.expectedStatus !== 'skipped')
+    acc[requireFile] = acc[requireFile] ? [...acc[requireFile], ...nonSkippedTests] : [...nonSkippedTests]
+    return acc
+  }, {})
+  const skippedTestGroups = testGroups.reduce((acc, { requireFile, tests }) => {
+    const skippedTests = tests.filter(test => test.expectedStatus === 'skipped')
+    acc[requireFile] = acc[requireFile] ? [...acc[requireFile], ...skippedTests] : [...skippedTests]
     return acc
   }, {})
+  return {
+    nonSkippedTestGroups,
+    skippedTestGroups
+  }
 }
 
 function getTestsBySuiteFromTestsById (testsById) {
@@ -305,6 +311,15 @@ function testBeginHandler (test, browserName, isMainProcess) {
     const testSuiteCtx = { testSuiteAbsolutePath }
     testSuiteToCtx.set(testSuiteAbsolutePath, testSuiteCtx)
     testSuiteStartCh.runStores(testSuiteCtx, () => {})
+    const skippedTests = skippedTestsByFile[testSuiteAbsolutePath]
+    if (skippedTests) {
+      // We report the skipped tests at the beginning of the suite to avoid
+      skippedTests.forEach(test => {
+        testBeginHandler(test, browserName, true)
+        testEndHandler(test, [], 'skip', null, false, true)
+      })
+      delete skippedTestsByFile[testSuiteAbsolutePath]
+    }
   }
 
   // We disable retries by default if attemptToFix is true
@@ -428,6 +443,7 @@ function testEndHandler (test, annotations, testStatus, error, isTimeout, isMain
 
 function dispatcherRunWrapper (run) {
   return function () {
+    // TODO: add `skippedTestsByFile` here
     remainingTestsByFile = getTestsBySuiteFromTestsById(this._testById)
     return run.apply(this, arguments)
   }
@@ -440,7 +456,9 @@ function dispatcherRunWrapperNew (run) {
       // Not available from >=1.44.0
       this._ddAllTests = testGroups.flatMap(g => g.tests)
     }
-    remainingTestsByFile = getTestsBySuiteFromTestGroups(testGroups)
+    const { nonSkippedTestGroups, skippedTestGroups } = getTestsBySuiteFromTestGroups(testGroups)
+    remainingTestsByFile = nonSkippedTestGroups
+    skippedTestsByFile = skippedTestGroups
     return run.apply(this, arguments)
   }
 }
@@ -628,7 +646,7 @@ function runAllTestsWrapper (runAllTests, playwrightVersion) {
     Object.values(remainingTestsByFile).forEach(tests => {
       // `tests` should normally be empty, but if it isn't,
       // there were tests that did not go through `testBegin` or `testEnd`,
-      // because they were skipped
+      // because they were skipped and were not handled in `skippedTestsByFile`
       tests.forEach(test => {
         const browser = getBrowserNameFromProjects(projects, test)
         testBeginHandler(test, browser, true)