Changeset 283172 in webkit

Timestamp:

Sep 28, 2021, 9:17:24 AM (5 years ago)

Author:

youenn@apple.com

Message:

REGRESSION (r283102): [ MacOS Debug ] TestWebKitAPI.WebKit2.CaptureIndicatorDelay is failing
​https://bugs.webkit.org/show_bug.cgi?id=230847
<rdar://problem/83577251>

Reviewed by Saam Barati.

As identified by Saam, the promise resolution callback is racing with the stop function.
To prevent this, we check in a loop whether the page has a stream and call stop when that is the case.

• TestWebKitAPI/Tests/WebKit/GetUserMedia.mm:

(TestWebKitAPI::TEST):

• TestWebKitAPI/Tests/WebKit/getUserMedia.html:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKit/GetUserMedia.mm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-09-28  Youenn Fablet  <youenn@apple.com>
+
+        REGRESSION (r283102): [ MacOS Debug ] TestWebKitAPI.WebKit2.CaptureIndicatorDelay is failing
+        https://bugs.webkit.org/show_bug.cgi?id=230847
+        <rdar://problem/83577251>
+
+        Reviewed by Saam Barati.
+
+        As identified by Saam, the promise resolution callback is racing with the stop function.
+        To prevent this, we check in a loop whether the page has a stream and call stop when that is the case.
+
+        * TestWebKitAPI/Tests/WebKit/GetUserMedia.mm:
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/Tests/WebKit/getUserMedia.html:
+
 2021-09-28  Geza Lore  <gezalore@gmail.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit/GetUserMedia.mm

@@ -394 +394 @@
     EXPECT_TRUE(waitUntilCaptureState(webView.get(), _WKMediaCaptureStateDeprecatedActiveCamera));
 
-    [delegate waitUntilPrompted];
+    int retryCount = 1000;
+    while (--retryCount && ![webView stringByEvaluatingJavaScript:@"haveStream()"].boolValue)
+        TestWebKitAPI::Util::spinRunLoop(10);
+    EXPECT_TRUE(!!retryCount);
 
     [webView stringByEvaluatingJavaScript:@"stop()"];