[webkit-changes] [264837] trunk/Tools

[youenn]

Title: [264837] trunk/Tools

Revision

264837

Author

you...@apple.com

Date

2020-07-24 10:15:26 -0700 (Fri, 24 Jul 2020)

Log Message

Add some logging to debug WebKit.QuotaDelegate test that times out on a Debug bot
https://bugs.webkit.org/show_bug.cgi?id=214725

Reviewed by Darin Adler.

* TestWebKitAPI/Tests/WebKitCocoa/StorageQuota.mm:
(doTest):

Modified Paths

• trunk/Tools/ChangeLog
• trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/StorageQuota.mm

Diff

Modified: trunk/Tools/ChangeLog (264836 => 264837)

--- trunk/Tools/ChangeLog	2020-07-24 17:13:22 UTC (rev 264836)
+++ trunk/Tools/ChangeLog	2020-07-24 17:15:26 UTC (rev 264837)
@@ -1,3 +1,13 @@
+2020-07-24  Youenn Fablet  <you...@apple.com>
+
+        Add some logging to debug WebKit.QuotaDelegate test that times out on a Debug bot
+        https://bugs.webkit.org/show_bug.cgi?id=214725
+
+        Reviewed by Darin Adler.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/StorageQuota.mm:
+        (doTest):
+
 2020-07-24  Chris Dumez  <cdu...@apple.com>
 
         [ iOS wk2 ] imported/w3c/web-platform-tests/web-share/share-without-user-gesture.https.html is a constant timeout

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/StorageQuota.mm (264836 => 264837)

--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/StorageQuota.mm	2020-07-24 17:13:22 UTC (rev 264836)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/StorageQuota.mm	2020-07-24 17:15:26 UTC (rev 264837)
@@ -139,14 +139,18 @@
 
 async function doTest()
 {
-    const cache = await window.caches.open("mycache");
-    const promise = cache.put("http://example.org/test", new Response(new ArrayBuffer(1024 * 500)));
-    window.webkit.messageHandlers.qt.postMessage("start");
-    promise.then(() => {
-        window.webkit.messageHandlers.qt.postMessage("pass");
-    }, () => {
-        window.webkit.messageHandlers.qt.postMessage("fail");
-    });
+    try {
+        const cache = await window.caches.open("mycache");
+        const promise = cache.put("http://example.org/test", new Response(new ArrayBuffer(1024 * 500)));
+        window.webkit.messageHandlers.qt.postMessage("start");
+        promise.then(() => {
+            window.webkit.messageHandlers.qt.postMessage("pass");
+        }, () => {
+            window.webkit.messageHandlers.qt.postMessage("fail");
+        });
+    } catch (e) {
+        window.webkit.messageHandlers.qt.postMessage("fail with exception " + e);
+    }
 }
 doTest();
 
@@ -166,13 +170,17 @@
     index++;
     url = "" + index;
 
-    const cache = await window.caches.open("mycache");
-    const promise = cache.put(url, new Response(new ArrayBuffer(num * 1024 * 1024)));
-    promise.then(() => {
-        window.webkit.messageHandlers.qt.postMessage("pass");
-    }, () => {
-        window.webkit.messageHandlers.qt.postMessage("fail");
-    });
+    try {
+        const cache = await window.caches.open("mycache");
+        const promise = cache.put(url, new Response(new ArrayBuffer(num * 1024 * 1024)));
+        promise.then(() => {
+            window.webkit.messageHandlers.qt.postMessage("pass");
+        }, () => {
+            window.webkit.messageHandlers.qt.postMessage("fail");
+        });
+    } catch (e) {
+        window.webkit.messageHandlers.qt.postMessage("fail with exception " + e);
+    }
 }
 
 function doTest(num)
@@ -220,11 +228,15 @@
     auto delegate1 = adoptNS([[QuotaDelegate alloc] init]);
     [webView1 setUIDelegate:delegate1.get()];
     setVisible(webView1.get());
-    
+
+    NSLog(@"QuotaDelegate 1");
+
     receivedQuotaDelegateCalled = false;
     [webView1 loadRequest:server.request()];
     Util::run(&receivedQuotaDelegateCalled);
 
+    NSLog(@"QuotaDelegate 2");
+
     auto webView2 = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get() addToWindow:YES]);
     auto delegate2 = adoptNS([[QuotaDelegate alloc] init]);
     [webView2 setUIDelegate:delegate2.get()];
@@ -235,6 +247,8 @@
     [messageHandler setExpectedMessage: @"start"];
     Util::run(&receivedMessage);
 
+    NSLog(@"QuotaDelegate 3");
+
     EXPECT_FALSE(delegate2.get().quotaDelegateCalled);
     [delegate1 grantQuota];
 
@@ -242,14 +256,20 @@
     receivedMessage = false;
     Util::run(&receivedMessage);
 
+    NSLog(@"QuotaDelegate 4");
+
     while (!delegate2.get().quotaDelegateCalled)
         TestWebKitAPI::Util::sleep(0.1);
 
+    NSLog(@"QuotaDelegate 5");
+
     [delegate2 denyQuota];
 
     [messageHandler setExpectedMessage: @"fail"];
     receivedMessage = false;
     Util::run(&receivedMessage);
+
+    NSLog(@"QuotaDelegate 6");
 }
 
 TEST(WebKit, QuotaDelegateReload)

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes