Changeset 258649 in webkit

Timestamp:

Mar 18, 2020 10:57:45 AM (4 years ago)

Author:

Chris Dumez

Message:

[ Mac wk2 ] http/wpt/beacon/beacon-quota.html is flaky failing
​https://bugs.webkit.org/show_bug.cgi?id=207894
<rdar://problem/59551688>

Reviewed by Geoffrey Garen.

Source/WebCore:

Add internals API exposing the number of inflight beacon loads for a given navigator object
so that the test can rely on it.

• Modules/beacon/NavigatorBeacon.h:
• testing/Internals.cpp:

(WebCore::Internals::inflightBeaconsCount const):

• testing/Internals.h:
• testing/Internals.idl:

LayoutTests:

Update test to address flakiness and unskip it.

• http/wpt/beacon/beacon-quota-expected.txt:
• http/wpt/beacon/beacon-quota.html:
• platform/mac-wk2/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/wpt/beacon/beacon-quota-expected.txt (modified) (1 diff)
• LayoutTests/http/wpt/beacon/beacon-quota.html (modified) (2 diffs)
• LayoutTests/platform/mac-wk2/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/beacon/NavigatorBeacon.h (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (2 diffs)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-03-18  Chris Dumez  <cdumez@apple.com>
+
+        [ Mac wk2 ] http/wpt/beacon/beacon-quota.html is flaky failing
+        https://bugs.webkit.org/show_bug.cgi?id=207894
+        <rdar://problem/59551688>
+
+        Reviewed by Geoffrey Garen.
+
+        Update test to address flakiness and unskip it.
+
+        * http/wpt/beacon/beacon-quota-expected.txt:
+        * http/wpt/beacon/beacon-quota.html:
+        * platform/mac-wk2/TestExpectations:
+
 2020-03-18  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/LayoutTests/http/wpt/beacon/beacon-quota-expected.txt

@@ -1 @@
-CONSOLE MESSAGE: line 44: Beacon API cannot load http://localhost:8800/. Reached maximum amount of queued data of 64Kb for keepalive requests
-CONSOLE MESSAGE: line 52: Beacon API cannot load http://localhost:8800/. Reached maximum amount of queued data of 64Kb for keepalive requests
+CONSOLE MESSAGE: line 30: Beacon API cannot load http://localhost:8800/. Reached maximum amount of queued data of 64Kb for keepalive requests
+CONSOLE MESSAGE: line 39: Beacon API cannot load http://localhost:8800/. Reached maximum amount of queued data of 64Kb for keepalive requests
 
 PASS Beacon with a body above the Quota Limit should fail. 

trunk/LayoutTests/http/wpt/beacon/beacon-quota.html

@@ -9 +9 @@
     var expectedQuota = 65536;
 
-    function checkBeaconReceived(id)
+    function waitForBeaconCompletion()
     {
         return new Promise(function(resolve, reject) {
-            var checkUrl = RESOURCES_DIR + "beacon-preflight.py?cmd=get&id=" + id;
-            fetch(checkUrl).then(response => {
-                response.json().then(result => {
-                    resolve(result['beacon'] == 1);
-                });
-            }, reject);
-        });
-    }
-
-    function waitForBeacon(id)
-    {
-        return new Promise(function(resolve, reject) {
-            checkBeaconReceived(id).then(wasReceived => {
-                if (wasReceived) {
-                    resolve();
-                    return;
-                }
-                setTimeout(function() {
-                    waitForBeacon(id).then(resolve, reject);
-                }, 10);
-            });
+            if (!internals.inflightBeaconsCount) {
+                resolve();
+                return;
+            }
+            setTimeout(function() {
+                waitForBeaconCompletion().then(resolve, reject);
+            }, 10);
         });
     }
@@ -50 +36 @@
 
         assert_true(navigator.sendBeacon(target, createPayload(expectedQuota)), "Beacon with a body at the Quota Limit should succeed.");
+        assert_equals(internals.inflightBeaconsCount, 1);
         assert_false(navigator.sendBeacon("/", createPayload(1)), "Second beacon should not be sent because we reached the quota");
-        return waitForBeacon(id).then(function() {
+        return waitForBeaconCompletion().then(function() {
             assert_true(navigator.sendBeacon(target, createPayload(1)), "Allocated quota should be returned once the beacon is no longer in flight");
         });

trunk/LayoutTests/platform/mac-wk2/TestExpectations

@@ -1046 +1046 @@
 webkit.org/b/207864 webgpu/whlsl/do-while-loop-continue.html [ Pass ImageOnlyFailure ]
 
-webkit.org/b/207894 http/wpt/beacon/beacon-quota.html [ Pass Failure ]
-
 webkit.org/b/207938 http/wpt/crypto/derive-hmac-key-crash.any.html [ Pass Crash ]
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-03-18  Chris Dumez  <cdumez@apple.com>
+
+        [ Mac wk2 ] http/wpt/beacon/beacon-quota.html is flaky failing
+        https://bugs.webkit.org/show_bug.cgi?id=207894
+        <rdar://problem/59551688>
+
+        Reviewed by Geoffrey Garen.
+
+        Add internals API exposing the number of inflight beacon loads for a given navigator object
+        so that the test can rely on it.
+
+        * Modules/beacon/NavigatorBeacon.h:
+        * testing/Internals.cpp:
+        (WebCore::Internals::inflightBeaconsCount const):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2020-03-18  Frederic Wang  <fwang@igalia.com>
 

trunk/Source/WebCore/Modules/beacon/NavigatorBeacon.h

@@ -47 +47 @@
     static ExceptionOr<bool> sendBeacon(Navigator&, Document&, const String& url, Optional<FetchBody::Init>&&);
 
+    size_t inflightBeaconsCount() const { return m_inflightBeacons.size(); }
+
+    WEBCORE_EXPORT static NavigatorBeacon* from(Navigator&);
+
 private:
     ExceptionOr<bool> sendBeacon(Document&, const String& url, Optional<FetchBody::Init>&&);
 
-    static NavigatorBeacon* from(Navigator&);
     static const char* supplementName();
 

trunk/Source/WebCore/testing/Internals.cpp

@@ -134 +134 @@
 #include "MockPageOverlay.h"
 #include "MockPageOverlayClient.h"
+#include "NavigatorBeacon.h"
 #include "NavigatorMediaDevices.h"
 #include "NetworkLoadInformation.h"
@@ -638 +639 @@
 }
 
+unsigned Internals::inflightBeaconsCount() const
+{
+    auto* document = contextDocument();
+    if (!document)
+        return 0;
+
+    auto* window = document->domWindow();
+    if (!window)
+        return 0;
+
+    auto* navigator = window->optionalNavigator();
+    if (!navigator)
+        return 0;
+
+    return NavigatorBeacon::from(*navigator)->inflightBeaconsCount();
+}
+
 unsigned Internals::workerThreadCount() const
 {

trunk/Source/WebCore/testing/Internals.h

@@ -658 +658 @@
     void simulateSystemWake() const;
 
+    unsigned inflightBeaconsCount() const;
+
     enum class PageOverlayType { View, Document };
     ExceptionOr<Ref<MockPageOverlay>> installMockPageOverlay(PageOverlayType);

trunk/Source/WebCore/testing/Internals.idl

@@ -240 +240 @@
     [MayThrowException] unsigned long lastSpatialNavigationCandidateCount();
 
+    readonly attribute unsigned long inflightBeaconsCount;
+
     // CSS Animation testing.
     unsigned long numberOfActiveAnimations();