[test optimization] Fix attempt to fix logic in playwright (#7325)

juan-fernandez · web-flow · commit 5b46416622c2 · 2026-01-23T14:39:00.000+01:00
diff --git a/integration-tests/playwright/playwright.spec.js b/integration-tests/playwright/playwright.spec.js
@@ -1314,12 +1314,12 @@ versions.forEach((version) => {
                 test => test.meta[TEST_NAME].startsWith('attempt to fix should attempt to fix')
               )
 
-              if (isDisabled) {
+              if (isDisabled && !isAttemptingToFix) {
                 assert.strictEqual(attemptedToFixTests.length, 2)
                 assert.ok(attemptedToFixTests.every(test =>
                   test.meta[TEST_MANAGEMENT_IS_DISABLED] === 'true'
                 ))
-                // if the test is disabled, there will be no retries
+                // if the test is disabled and not attempting to fix, there will be no retries
                 return
               }
 
@@ -1329,6 +1329,20 @@ versions.forEach((version) => {
                 assert.strictEqual(attemptedToFixTests.length, 2)
               }
 
+              if (isDisabled) {
+                const numDisabledTests = attemptedToFixTests.filter(test =>
+                  test.meta[TEST_MANAGEMENT_IS_DISABLED] === 'true'
+                ).length
+                // disabled tests with attemptToFix still run and are retried
+                assert.strictEqual(numDisabledTests, 2 * (ATTEMPT_TO_FIX_NUM_RETRIES + 1))
+                // disabled tests with attemptToFix should not be skipped - they should run with pass/fail status
+                const skippedDisabledTests = attemptedToFixTests.filter(test =>
+                  test.meta[TEST_MANAGEMENT_IS_DISABLED] === 'true' &&
+                  test.meta[TEST_STATUS] === 'skip'
+                ).length
+                assert.strictEqual(skippedDisabledTests, 0, 'disabled tests with attemptToFix should not be skipped')
+              }
+
               if (isQuarantined) {
                 const numQuarantinedTests = attemptedToFixTests.filter(test =>
                   test.meta[TEST_MANAGEMENT_IS_QUARANTINED] === 'true'
diff --git a/packages/datadog-instrumentations/src/playwright.js b/packages/datadog-instrumentations/src/playwright.js
@@ -484,10 +484,11 @@ function dispatcherRunWrapper (run) {
 
 function dispatcherRunWrapperNew (run) {
   return function (testGroups) {
-    // Filter out disabled tests from testGroups before they get scheduled
+    // Filter out disabled tests from testGroups before they get scheduled,
+    // unless they have attemptToFix (in which case they should still run and be retried)
     if (isTestManagementTestsEnabled) {
       testGroups.forEach(group => {
-        group.tests = group.tests.filter(test => !test._ddIsDisabled)
+        group.tests = group.tests.filter(test => !test._ddIsDisabled || test._ddIsAttemptToFix)
       })
       // Remove empty groups
       testGroups = testGroups.filter(group => group.tests.length > 0)
@@ -911,14 +912,16 @@ addHook({
       const fileSuitesWithManagedTestsToProjects = new Map()
       for (const test of allTests) {
         const testProperties = getTestProperties(test)
-        // Disabled tests are skipped and not retried
+        // Disabled tests are skipped unless they have attemptToFix
         if (testProperties.disabled) {
           test._ddIsDisabled = true
-          test.expectedStatus = 'skipped'
-          // setting test.expectedStatus to 'skipped' does not work for every case,
-          // so we need to filter out disabled tests in dispatcherRunWrapperNew,
-          // so they don't get to the workers
-          continue
+          if (!testProperties.attemptToFix) {
+            test.expectedStatus = 'skipped'
+            // setting test.expectedStatus to 'skipped' does not work for every case,
+            // so we need to filter out disabled tests in dispatcherRunWrapperNew,
+            // so they don't get to the workers
+            continue
+          }
         }
         if (testProperties.quarantined) {
           test._ddIsQuarantined = true
@@ -947,6 +950,7 @@ addHook({
         (test) => test._ddIsAttemptToFix,
         [
           (test) => test._ddIsQuarantined && '_ddIsQuarantined',
+          (test) => test._ddIsDisabled && '_ddIsDisabled',
           '_ddIsAttemptToFix',
           '_ddIsAttemptToFixRetry'
         ],
