From 96c4e124d2fe4194f1eff3166aceba8d1e310c3c Mon Sep 17 00:00:00 2001
From: Sohom <sohom.datta@learner.manipal.edu>
Date: Mon, 24 Oct 2022 04:03:18 -0700
Subject: [PATCH] Fix flaky wpt test
 external/wpt/longtask-timing/longtask-in-externalscript.html

Bug: 1377104
Change-Id: If49d9a286ba9691304477d48e80578c11c6d385b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3973567
Reviewed-by: Yoav Weiss <yoavweiss@chromium.org>
Commit-Queue: Sohom Datta <dattasohom1@gmail.com>
Cr-Commit-Position: refs/heads/main@{#1062744}
---
 .../longtask-in-externalscript.html           | 71 +++++++++++--------
 1 file changed, 42 insertions(+), 29 deletions(-)

diff --git a/longtask-timing/longtask-in-externalscript.html b/longtask-timing/longtask-in-externalscript.html
index ad194ac9719113..0d8f5ccb67d052 100644
--- a/longtask-timing/longtask-in-externalscript.html
+++ b/longtask-timing/longtask-in-externalscript.html
@@ -10,37 +10,50 @@
 <h1>Long Task: External Script</h1>
 <div id="log"></div>
 <script>
-  async_test(function (t) {
-    assert_implements(window.PerformanceLongTaskTiming, 'Longtasks are not supported.');
+promise_test(function(t) {
+  assert_implements(window.PerformanceLongTaskTiming, 'Longtasks are not supported.');
+  const performanceObserverTimeout = 5 * 1000;
+  const longTasksPromise = new Promise(resolve => {
     const observer = new PerformanceObserver(
-        t.step_func(function (entryList) {
-            const entries = entryList.getEntries();
-            assert_equals(entries.length, 1,
-                'Exactly one entry is expected.');
-            const longtask = entries[0];
-            checkLongTaskEntry(longtask);
-            // Assert the TaskAttributionTiming entry in attribution.
-            assert_equals(longtask.attribution.length, 1,
-                'Exactly one attribution entry is expected');
-            const attribution = longtask.attribution[0];
-            assert_equals(attribution.entryType, 'taskattribution');
-            assert_equals(attribution.name, 'unknown');
-            assert_equals(attribution.duration, 0);
-            assert_equals(attribution.startTime, 0);
-            assert_equals(attribution.containerType, 'window');
-            assert_equals(attribution.containerId, '');
-            assert_equals(attribution.containerName, '');
-            assert_equals(attribution.containerSrc, '');
-            observer.disconnect();
-            t.done();
+      t.step_func(function(entryList) {
+        const entries = entryList.getEntries();
+        entries.forEach(longtask => {
+          assert_equals(longtask.entryType, 'longtask');
+          if (hasUnrelatedTaskName(longtask.name, 'self')) {
+            return;
+          }
+          checkLongTaskEntry(longtask);
+          // Assert the TaskAttributionTiming entry in attribution.
+          assert_equals(longtask.attribution.length, 1,
+            'Exactly one attribution entry is expected');
+          const attribution = longtask.attribution[0];
+          assert_equals(attribution.entryType, 'taskattribution');
+          assert_equals(attribution.name, 'unknown');
+          assert_equals(attribution.duration, 0);
+          assert_equals(attribution.startTime, 0);
+          assert_equals(attribution.containerType, 'window');
+          assert_equals(attribution.containerId, '');
+          assert_equals(attribution.containerName, '');
+          assert_equals(attribution.containerSrc, '');
+          observer.disconnect();
+          resolve();
         })
-    );
-    observer.observe({entryTypes: ['longtask']});
-    window.onload = () => {
-        const script = document.createElement('script');
-        script.src = 'resources/makelongtask.js';
-        document.body.appendChild(script);
-    }
+      }));
+    observer.observe({
+      entryTypes: ['longtask']
+    });
+    const script = document.createElement('script');
+    script.src = 'resources/makelongtask.js';
+    document.body.appendChild(script);
+  });
+  const timeout = new Promise(
+    (resolve, reject) => t.step_timeout(
+      () => {
+        reject(new Error('observer failed to find any entries'))
+      },
+      performanceObserverTimeout)
+  )
+  return Promise.race([longTasksPromise, timeout]);
 }, 'Performance longtask entries are observable.');
 </script>
 </body>